From: Steven Dake <sdake@redhat.com>
Date: Mon, 16 Apr 2012 23:33:45 +0000 (-0700)
Subject: Adjust cfn-init to not use -f option
X-Git-Tag: 2014.1~1989
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=162826f9d713a8116fbfe832a3e3bc7380cdb4c7;p=openstack-build%2Fheat-build.git

Adjust cfn-init to not use -f option

Fixes issue #75 for WordPress_2_Instances_With_EBS_Volume.template

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

diff --git a/templates/WordPress_2_Instances_With_EBS_Volume.template b/templates/WordPress_2_Instances_With_EBS_Volume.template
index a3b65be4..73c4247d 100644
--- a/templates/WordPress_2_Instances_With_EBS_Volume.template
+++ b/templates/WordPress_2_Instances_With_EBS_Volume.template
@@ -127,7 +127,7 @@
         "KeyName"        : { "Ref" : "KeyName" },
         "UserData"       : { "Fn::Base64" : { "Fn::Join" : ["", [
           "#!/bin/bash -v\n",
-          "/opt/aws/bin/cfn-init -f /var/lib/cloud/data/cfn-init-data\n",
+          "/opt/aws/bin/cfn-init\n",
 
           "# Wait for the volume to appear\n",
           "while [ ! -e /dev/vdb ]; do echo Waiting for volume to attach; sleep 1; done\n",
@@ -193,7 +193,7 @@
         "KeyName"        : { "Ref" : "KeyName" },
         "UserData"       : { "Fn::Base64" : { "Fn::Join" : ["", [
           "#!/bin/bash -v\n",
-          "/opt/aws/bin/cfn-init -f /var/lib/cloud/data/cfn-init-data\n",
+          "/opt/aws/bin/cfn-init\n",
           "sed --in-place --e s/database_name_here/", { "Ref" : "DBName" }, "/ --e s/username_here/", { "Ref" : "DBUsername" }, "/ --e s/password_here/", { "Ref" : "DBPassword" }, "/ --e s/localhost/", { "Fn::GetAtt" : [ "WikiDatabase", "PublicIp" ]}, "/ /usr/share/wordpress/wp-config.php\n"
         ]]}}
       }