Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #20951 fixed multi_ok (var multi usage in vpc_exists function) #20953

Merged
merged 1 commit into from
Feb 9, 2017
+6 −5
Merged

Fixes #20951 fixed multi_ok (var multi usage in vpc_exists function) #20953

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions lib/ansible/modules/cloud/amazon/ec2_vpc_net.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ def boto_exception(err):
return error

def vpc_exists(module, vpc, name, cidr_block, multi):
"""Returns True or False in regards to the existence of a VPC. When supplied
"""Returns None or a vpc object depending on the existence of a VPC. When supplied
with a CIDR, it will check for matching tags to determine if it is a match
otherwise it will assume the VPC does not exist and thus return false.
otherwise it will assume the VPC does not exist and thus return None.
"""
matched_vpc = None

Expand All @@ -130,11 +130,12 @@ def vpc_exists(module, vpc, name, cidr_block, multi):
e_msg=boto_exception(e)
module.fail_json(msg=e_msg)

if len(matching_vpcs) == 1:
if multi:
return None
elif len(matching_vpcs) == 1:
matched_vpc = matching_vpcs[0]
elif len(matching_vpcs) > 1:
if multi:
module.fail_json(msg='Currently there are %d VPCs that have the same name and '
module.fail_json(msg='Currently there are %d VPCs that have the same name and '
'CIDR block you specified. If you would like to create '
'the VPC anyway please pass True to the multi_ok param.' % len(matching_vpcs))

Expand Down