From dedb9475a91fc4833adf4a5201c5898b09081ad2 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Fri, 3 Aug 2012 16:42:46 -0700 Subject: [PATCH] Log all startup operations to /var/log/heat-startup.log Change-Id: I0e7f415e7aee60c09d0b5b172742af7a5b313191 Signed-off-by: Steven Dake --- MANIFEST.in | 1 + heat/cloudinit/loguserdata.sh | 3 +++ heat/engine/instance.py | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 heat/cloudinit/loguserdata.sh diff --git a/MANIFEST.in b/MANIFEST.in index 5c4c32617c..8238159594 100644 --- 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 index 0000000000..1a54dfffba --- /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 179995558f..1935c4464b 100644 --- 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),