From: Ian Main <imain@redhat.com>
Date: Thu, 6 Sep 2012 02:00:54 +0000 (-0700)
Subject: Add a newline to user data injection.
X-Git-Tag: 2014.1~1468^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b1696fb1b0be8e6e2ce154d748ed25289a216125;p=openstack-build%2Fheat-build.git

Add a newline to user data injection.

If no newline is present at the end of the user-data section of the
template, the addition of the touch command will cause the last
line to break.

Change-Id: I15ba402f83f6fba03f7d0455a63a5dc03480973d
Signed-off-by: Ian Main <imain@redhat.com>
---

diff --git a/heat/engine/instance.py b/heat/engine/instance.py
index 9d19a71d..74f05e3c 100644
--- a/heat/engine/instance.py
+++ b/heat/engine/instance.py
@@ -191,7 +191,7 @@ class Instance(resources.Resource):
     def handle_create(self):
         security_groups = self.properties.get('SecurityGroups')
         userdata = self.properties['UserData']
-        userdata += 'touch /var/lib/cloud/instance/provision-finished\n'
+        userdata += '\ntouch /var/lib/cloud/instance/provision-finished\n'
         flavor = self.properties['InstanceType']
         key_name = self.properties['KeyName']