From: Angus Salkeld <asalkeld@redhat.com>
Date: Tue, 5 Mar 2013 12:44:54 +0000 (+1100)
Subject: Make sure we have a volumes property before trying to use it
X-Git-Tag: 2014.1~812^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d817ec2f7f077808e4f6f6e3b797079a7b03cc47;p=openstack-build%2Fheat-build.git

Make sure we have a volumes property before trying to use it

bug 1146742
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Change-Id: I2d56af0b07f544642e0527a8300db842d2bc0268
---

diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py
index 5d9b1696..eb2bf053 100644
--- a/heat/engine/resources/instance.py
+++ b/heat/engine/resources/instance.py
@@ -314,6 +314,8 @@ class Instance(resource.Resource):
                                    self.name, server.status))
 
     def attach_volumes(self):
+        if not self.properties['Volumes']:
+            return
         server_id = self.resource_id
         for vol in self.properties['Volumes']:
             if 'DeviceId' in vol: