From: Steven Dake <sdake@redhat.com>
Date: Wed, 23 May 2012 14:42:19 +0000 (-0700)
Subject: Only run cfn-init once
X-Git-Tag: 2014.1~1797
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=72c383396d42c21b73b4ce66717e6e0cfd2978ce;p=openstack-build%2Fheat-build.git

Only run cfn-init once

cloud-config-final.service (atleast in Fedora 16) runs the user scripts.  So
there is no need to run them in cloud-config.service (which this file is processed
by).

May need a revisit on deb based systems.

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

diff --git a/heat/cloudinit/config b/heat/cloudinit/config
index 494f9d83..a5f2771e 100644
--- a/heat/cloudinit/config
+++ b/heat/cloudinit/config
@@ -1,7 +1,6 @@
 #cloud-config
 cloud_config_modules:
  - locale
- - scripts_user
  - set_hostname
  - ssh
  - timezone