saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Returning security group when no VPC id is given, even if the group is not in EC2-classic.

Browse source
This commit is contained in:
Ruxandra Burtica 2015-12-09 11:34:11 +02:00 • committed by rallytime
parent a2a7f1527b
commit 5e7e3fe682
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/boto_secgroup.py
View file

@ -174,6 +174,11 @@ def _get_group(conn=None, name=None, vpc_id=None, vpc_name=None, group_id=None,
# a group in EC2-Classic will have vpc_id set to None
if group.vpc_id is None:
return group
# If there are more security groups, and no vpc_id, we can't know which one to choose.
if len(filtered_groups) > 1:
raise Exception('Security group belongs to more VPCs, specify the VPC ID!')
elif len(filtered_groups) == 1:
return filtered_groups[0]
return None
elif vpc_id:
log.debug('getting group for {0} in vpc_id {1}'.format(name, vpc_id))