cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes regression introduced by edf1ac1ea6

Browse source
This commit is contained in:
Bobby Calderwood 2015-04-21 14:56:46 -04:00 committed by Matt Clay
parent 9133ae8c55
commit cd14b8115b
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/modules/cloud/amazon/ec2_vpc.py
View file

@ -486,14 +486,15 @@ def create_vpc(module, vpc_conn):
'id': sn.id, 'id': sn.id,
}) })
# Sort subnets by the order they were listed in the play if subnets is not None:
order = {} # Sort subnets by the order they were listed in the play
for idx, val in enumerate(subnets): order = {}
order[val['cidr']] = idx for idx, val in enumerate(subnets):
order[val['cidr']] = idx
# Number of subnets in the play # Number of subnets in the play
subnets_in_play = len(subnets) subnets_in_play = len(subnets)
returned_subnets.sort(key=lambda x: order.get(x['cidr'], subnets_in_play)) returned_subnets.sort(key=lambda x: order.get(x['cidr'], subnets_in_play))
return (vpc_dict, created_vpc_id, returned_subnets, changed) return (vpc_dict, created_vpc_id, returned_subnets, changed)