From 9bad23299184fc19ec3e4aee8241bae667c639ee Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Wed, 11 Apr 2012 00:33:40 -0700 Subject: [PATCH] Make better use of cloud-init Signed-off-by: Steven Dake --- heat/jeos/F16-x86_64-cfntools-jeos.tdl | 8 +------- heat/jeos/F17-x86_64-cfntools-jeos.tdl | 7 +------ 2 files changed, 2 insertions(+), 13 deletions(-) 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 @@ Fedora 16 -rm -f /etc/yum.repos.d/fedora-updates*;yum -y install cloud-init;cat >> /etc/rc.d/rc.local << EOF;chmod +x /etc/rc.d/rc.local +yum -y update --skip-broken;yum -y install cloud-init;cat >> /etc/rc.d/rc.local << 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 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 @@ Fedora 17 -rm -f /etc/yum.repos.d/fedora-updates*;yum -y install cloud-init;cat >> /etc/rc.d/rc.local << EOF;chmod +x /etc/rc.d/rc.local +yum -y update --skip-broken;yum -y install cloud-init;cat >> /etc/rc.d/rc.local << 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 -- 2.45.2