From: Steven Dake <sdake@redhat.com>
Date: Sun, 1 Apr 2012 17:35:35 +0000 (-0700)
Subject: Add installation of cloud-init to the JEOS creation operation
X-Git-Tag: 2014.1~2116
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0fbfc437ae047fb0b802072ea9ac5a1d0cca88e2;p=openstack-build%2Fheat-build.git

Add installation of cloud-init to the JEOS creation operation

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

diff --git a/heat/jeos/F16-x86_64-gold-jeos.tdl b/heat/jeos/F16-x86_64-gold-jeos.tdl
index 3217dca4..491676e6 100644
--- a/heat/jeos/F16-x86_64-gold-jeos.tdl
+++ b/heat/jeos/F16-x86_64-gold-jeos.tdl
@@ -12,7 +12,7 @@
   <description>Fedora 16</description>
   <commands>
     <command name='commands'>
-yum -y update;cat >> /etc/rc.d/rc.local &lt;&lt; EOF;chmod +x /etc/rc.d/rc.local
+yum -y update; 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
@@ -23,8 +23,6 @@ break
 fi
 sleep 1
 done
-systemctl start matahari-host.service
-systemctl start matahari-service.service
 
 if [ ! -d /root/.ssh ]; then
   mkdir -p /root/.ssh
diff --git a/heat/jeos/F17-x86_64-gold-jeos.tdl b/heat/jeos/F17-x86_64-gold-jeos.tdl
index 095093e0..a9b8a205 100644
--- a/heat/jeos/F17-x86_64-gold-jeos.tdl
+++ b/heat/jeos/F17-x86_64-gold-jeos.tdl
@@ -12,7 +12,7 @@
   <description>Fedora 17</description>
   <commands>
     <command name='commands'>
-yum -y update;cat >> /etc/rc.d/rc.local &lt;&lt; EOF;chmod +x /etc/rc.d/rc.local
+yum -y update;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
@@ -23,8 +23,6 @@ break
 fi
 sleep 1
 done
-systemctl start matahari-host.service
-systemctl start matahari-service.service
 
 if [ ! -d /root/.ssh ]; then
   mkdir -p /root/.ssh