From: Steven Dake <sdake@redhat.com>
Date: Wed, 11 Apr 2012 07:33:40 +0000 (-0700)
Subject: Make better use of cloud-init
X-Git-Tag: 2014.1~2063
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9bad23299184fc19ec3e4aee8241bae667c639ee;p=openstack-build%2Fheat-build.git

Make better use of cloud-init

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

diff --git a/heat/jeos/F16-x86_64-cfntools-jeos.tdl b/heat/jeos/F16-x86_64-cfntools-jeos.tdl
index 39f35af2..178278d3 100644
--- a/heat/jeos/F16-x86_64-cfntools-jeos.tdl
+++ b/heat/jeos/F16-x86_64-cfntools-jeos.tdl
@@ -12,7 +12,7 @@
   <description>Fedora 16</description>
   <commands>
     <command name='commands'>
-rm -f /etc/yum.repos.d/fedora-updates*;yum -y install cloud-init;cat >> /etc/rc.d/rc.local &lt;&lt; EOF;chmod +x /etc/rc.d/rc.local
+yum -y update --skip-broken;yum -y install cloud-init;cat >> /etc/rc.d/rc.local &lt;&lt; EOF;chmod +x /etc/rc.d/rc.local
 #!/bin/bash
 setenforce 0
 while true; do
@@ -49,13 +49,7 @@ while [ ! -f /root/.ssh/authorized_keys ]; do
         sleep 5
     fi
 done
-while [ ! -f /var/lib/cloud/instance/user-data.txt ]; do
-        sleep 1
-done
-base64 -d /var/lib/cloud/instance/user-data.txt > /tmp/startup
-chmod +x /tmp/startup
 chmod +x /opt/aws/bin/cfn-*
-/tmp/startup
 EOF
     </command>
   </commands>
diff --git a/heat/jeos/F17-x86_64-cfntools-jeos.tdl b/heat/jeos/F17-x86_64-cfntools-jeos.tdl
index 73600429..48212339 100644
--- a/heat/jeos/F17-x86_64-cfntools-jeos.tdl
+++ b/heat/jeos/F17-x86_64-cfntools-jeos.tdl
@@ -12,7 +12,7 @@
   <description>Fedora 17</description>
   <commands>
     <command name='commands'>
-rm -f /etc/yum.repos.d/fedora-updates*;yum -y install cloud-init;cat >> /etc/rc.d/rc.local &lt;&lt; EOF;chmod +x /etc/rc.d/rc.local
+yum -y update --skip-broken;yum -y install cloud-init;cat >> /etc/rc.d/rc.local &lt;&lt; EOF;chmod +x /etc/rc.d/rc.local
 #!/bin/bash
 setenforce 0
 while true; do
@@ -49,11 +49,6 @@ while [ ! -f /root/.ssh/authorized_keys ]; do
         sleep 5
     fi
 done
-while [ ! -f /var/lib/cloud/instance/user-data.txt ]; do
-        sleep 1
-done
-base64 -d /var/lib/cloud/instance/user-data.txt > /tmp/startup
-chmod +x /tmp/startup
 chmod +x /opt/aws/bin/cfn-*
 /tmp/startup
 EOF