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

Merge branch 'devel' of https://github.com/ansible/ansible into devel

Browse source
This commit is contained in:
James Cammarata 2014-06-06 21:56:32 -05:00
commit 5637426f51
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -42,7 +42,8 @@ Branch Info
Author Author
====== ======
Michael DeHaan -- michael@ansible.com Ansible was created by Michael DeHaan (michael@ansible.com) and has contributions from over
700 users (and growing). Thanks everyone!
[Ansible, Inc](http://ansible.com) [Ansible, Inc](http://ansible.com)

4
library/cloud/ec2_group
View file

@ -230,6 +230,10 @@ def main():
# to 0.0.0.0/0 is added automatically but it's not # to 0.0.0.0/0 is added automatically but it's not
# reflected in the object returned by the AWS API # reflected in the object returned by the AWS API
# call. We re-read the group for getting an updated object # call. We re-read the group for getting an updated object
# amazon sometimes takes a couple seconds to update the security group so wait till it exists
while len(ec2.get_all_security_groups(filters={ 'group_id': group.id, })) == 0:
time.sleep(0.1)
group = ec2.get_all_security_groups(group_ids=(group.id,))[0] group = ec2.get_all_security_groups(group_ids=(group.id,))[0]
changed = True changed = True
else: else: