wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ec2_group for EC2-Classic accounts (#46242)

Browse source 
* Fix ec2_group for EC2-Classic accounts

* changelog

(cherry picked from commit 9efc3dc761)
This commit is contained in:
Sloane Hertel 2018-09-27 23:11:04 -04:00 committed by Matt Clay
parent 6e90277c69
commit 36414cc518
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
changelogs/fragments/fix_ec2_group_vpc_precedence_classic.yaml Normal file
View file

@ -0,0 +1,7 @@
---
bugfixes:
- The patch fixing the regression of no longer preferring matching security
groups in the same VPC https://github.com/ansible/ansible/pull/45787
(which was also backported to 2.6) broke EC2-Classic accounts.
https://github.com/ansible/ansible/pull/46242 removes the assumption that
security groups must be in a VPC.

2
lib/ansible/modules/cloud/amazon/ec2_group.py
View file

@ -837,7 +837,7 @@ def group_exists(client, module, vpc_id, group_id, name):
groups = dict((group['GroupId'], group) for group in all_groups)
groups.update(dict((group['GroupName'], group) for group in all_groups))
if vpc_id:
vpc_wins = dict((group['GroupName'], group) for group in all_groups if group['VpcId'] == vpc_id)
vpc_wins = dict((group['GroupName'], group) for group in all_groups if group.get('VpcId') and group['VpcId'] == vpc_id)
groups.update(vpc_wins)
# maintain backwards compatibility by using the last matching group
return security_groups[-1], groups