From 98a9f2d5b8f807586807f0aaff93b40654519336 Mon Sep 17 00:00:00 2001 From: Bobby Calderwood Date: Tue, 21 Apr 2015 14:56:46 -0400 Subject: [PATCH] Fixes regression introduced by edf1ac1ea6ffd5d44bb2bb62ad320364baf310a3 --- cloud/amazon/ec2_vpc.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/cloud/amazon/ec2_vpc.py b/cloud/amazon/ec2_vpc.py index 23c25c27a87..3af74e94964 100644 --- a/cloud/amazon/ec2_vpc.py +++ b/cloud/amazon/ec2_vpc.py @@ -486,14 +486,15 @@ def create_vpc(module, vpc_conn): 'id': sn.id, }) - # Sort subnets by the order they were listed in the play - order = {} - for idx, val in enumerate(subnets): - order[val['cidr']] = idx - - # Number of subnets in the play - subnets_in_play = len(subnets) - returned_subnets.sort(key=lambda x: order.get(x['cidr'], subnets_in_play)) + if subnets is not None: + # Sort subnets by the order they were listed in the play + order = {} + for idx, val in enumerate(subnets): + order[val['cidr']] = idx + + # Number of subnets in the play + subnets_in_play = len(subnets) + returned_subnets.sort(key=lambda x: order.get(x['cidr'], subnets_in_play)) return (vpc_dict, created_vpc_id, returned_subnets, changed)