From 614efadb7a306c563b839aaa0d22a3c5f6054381 Mon Sep 17 00:00:00 2001 From: David Hummel Date: Thu, 5 Dec 2013 10:47:22 -0500 Subject: [PATCH] Fix issue #5043: ec2_vpc module wait=yes state attribute retrieval --- library/cloud/ec2_vpc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/library/cloud/ec2_vpc b/library/cloud/ec2_vpc index 28804a26a4..663a574f95 100644 --- a/library/cloud/ec2_vpc +++ b/library/cloud/ec2_vpc @@ -233,8 +233,12 @@ def create_vpc(module, vpc_conn): wait_timeout = time.time() + wait_timeout while wait and wait_timeout > time.time() and pending: pvpc = vpc_conn.get_all_vpcs(vpc.id) - if pvpc.state == "available": - pending = False + if hasattr(pvpc, 'state'): + if pvpc.state == "available": + pending = False + elif hasattr(pvpc[0], 'state'): + if pvpc[0].state == "available": + pending = False time.sleep(5) if wait and wait_timeout <= time.time(): # waiting took too long