From: Zane Bitter <zbitter@redhat.com>
Date: Fri, 14 Dec 2012 21:45:07 +0000 (+0100)
Subject: Handle empty UserData for instance
X-Git-Tag: 2014.1~1068
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a64fc0bc4b3a3104778efcbf5151783922172e49;p=openstack-build%2Fheat-build.git

Handle empty UserData for instance

UserData is not required, so handle the case where it is not supplied (i.e.
is None).

bug 1090544

Change-Id: If8bfe9ba2aafe3bb2e9de14b01c57d1ddcf9b21d
Signed-off-by: Zane Bitter <zbitter@redhat.com>
---

diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py
index 077c087d..9eac3b1b 100644
--- a/heat/engine/resources/instance.py
+++ b/heat/engine/resources/instance.py
@@ -214,7 +214,7 @@ class Instance(resource.Resource):
             security_groups = [self.physical_resource_name_find(sg) for sg in
                     self.properties.get('SecurityGroups')]
 
-        userdata = self.properties['UserData']
+        userdata = self.properties['UserData'] or ''
         userdata += '\ntouch /var/lib/cloud/instance/provision-finished\n'
         flavor = self.properties['InstanceType']
         key_name = self.properties['KeyName']