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 3217dca432b64623507ce9c66da233d559bd3da1..491676e6784297106923238032e615b9611a3135 100644 (file)
--- 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 095093e0b5e066e34c55bd30f4f88fcec2f7dd69..a9b8a2058452382a754091775af924edae4ee160 100644 (file)
--- 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