Fix ec2_group for EC2-Classic accounts (#46242)

* Fix ec2_group for EC2-Classic accounts

* changelog
pull/46245/head
Sloane Hertel 6 years ago committed by GitHub
parent 23c94295dc
commit 9efc3dc761
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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.

@ -856,7 +856,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

Loading…
Cancel
Save