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 5d9b169607a8b969b04a12b4f9ac65204acec361..eb2bf053ecec979ccba359c423460fd751645ae6 100644 (file)
--- 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: