Update i386 F16 cfntools image to match latest cloudinit features

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

diff --git a/heat/jeos/F16-i386-cfntools-jeos.tdl b/heat/jeos/F16-i386-cfntools-jeos.tdl
index 656a741160fbd1738974a8b59b54a8dd5b1e5d21..a1b68a9325d13827698415e6c6da6c1667178f18 100644 (file)
--- a/heat/jeos/F16-i386-cfntools-jeos.tdl
+++ b/heat/jeos/F16-i386-cfntools-jeos.tdl
@@ -12,44 +12,9 @@
   <description>Fedora 16</description>
   <commands>
     <command name='commands'>
-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
+yum -y update --skip-broken;yum -y update; yum -y install cloud-init;cat >> /etc/rc.d/rc.local &lt;&lt; EOF;chmod +x /etc/rc.d/rc.local;chmod +x /opt/aws/bin/cfg-*
 #!/bin/bash
 setenforce 0
-while true; do
-gdbus introspect --system --dest org.freedesktop.NetworkManager --object-path /org/freedesktop/NetworkManager/Devices/0 | grep "State = 100"
-if [ \$? -eq 0 ]
-then
-break
-fi
-sleep 1
-done
-
-if [ ! -d /root/.ssh ]; then
-  mkdir -p /root/.ssh
-  chmod 700 /root/.ssh
-fi
- 
-# Fetch public key using HTTP
-ATTEMPTS=10
-while [ ! -f /root/.ssh/authorized_keys ]; do
-    curl -f http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key > /tmp/aws-key 2>/dev/null
-    if [ \$? -eq 0 ]; then
-        cat /tmp/aws-key >> /root/.ssh/authorized_keys
-        chmod 0600 /root/.ssh/authorized_keys
-        restorecon /root/.ssh/authorized_keys
-        rm -f /tmp/aws-key
-        echo "Successfully retrieved AWS public key from instance metadata"
-    else
-        FAILED=\$((\$FAILED + 1))
-        if [ \$FAILED -ge \$ATTEMPTS ]; then
-            echo "Failed to retrieve AWS public key after \$FAILED attempts, quitting"
-            break
-        fi
-        echo "Could not retrieve AWS public key (attempt #\$FAILED/\$ATTEMPTS), retrying in 5 seconds..."
-        sleep 5
-    fi
-done
-chmod +x /opt/aws/bin/cfn-*
 EOF
     </command>
   </commands>