Log all startup operations to /var/log/heat-startup.log

Change-Id: I0e7f415e7aee60c09d0b5b172742af7a5b313191
Signed-off-by: Steven Dake <sdake@redhat.com>

diff --git a/MANIFEST.in b/MANIFEST.in
index 5c4c32617cb3b2d0e96707f7c7a14b0a9cde2c71..82381595941b1fe7f14b6e7b331cfcb7a833a6ab 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -8,6 +8,7 @@ include openstack-common.conf
 include babel.cfg
 graft templates
 include heat/cloudinit/config
+include heat/cloudinit/loguserdata.sh
 include heat/cloudinit/part-handler.py
 include heat/db/sqlalchemy/migrate_repo/migrate.cfg
 graft etc

diff --git a/heat/cloudinit/loguserdata.sh b/heat/cloudinit/loguserdata.sh
new file mode 100644 (file)
index 0000000..1a54dff
--- /dev/null
+++ b/heat/cloudinit/loguserdata.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+chmod +x /var/lib/cloud/data/cfn-userdata
+script -f -c /var/lib/cloud/data/cfn-userdata /var/log/heat-provision.log

diff --git a/heat/engine/instance.py b/heat/engine/instance.py
index 179995558f6b4f46896ea706a75f893303d24802..1935c4464be9688dfd60d3bc239eaa050a988931 100644 (file)
--- a/heat/engine/instance.py
+++ b/heat/engine/instance.py
@@ -168,7 +168,9 @@ class Instance(resources.Resource):
             attachments = [(read_cloudinit_file('config'), 'cloud-config'),
                            (read_cloudinit_file('part-handler.py'),
                             'part-handler.py'),
-                           (userdata, 'startup', 'x-shellscript')]
+                           (userdata, 'cfn-userdata', 'x-cfninitdata'),
+                           (read_cloudinit_file('loguserdata.sh'),
+                            'loguserdata.sh', 'x-shellscript')]
 
             if 'Metadata' in self.t:
                 attachments.append((json.dumps(self.metadata),