Merge branch 'master' of github.com:heat-api/heat

2012-04-12 18:32:48 -04:00 · 2012-04-12 18:32:48 -04:00 · ec794e6d4a
parent 2f5ec8738d aba5fc8a44
commit ec794e6d4a
7 changed files with 29 additions and 145 deletions
--- a/MANIFEST.in
+++ b/MANIFEST.in
@ -16,6 +16,8 @@ include heat/jeos/F17-x86_64-cfntools-jeos.tdl
 include heat/cfntools/cfn-init
 include heat/cfntools/cfn-hup
 include heat/cfntools/cfn-signal
+include heat/cloudinit/config
+include heat/cloudinit/part-handler.py
 include heat/db/sqlalchemy/migrate_repo/migrate.cfg
 graft etc
 graft docs
--- a/heat/cloudinit/config
+++ b/heat/cloudinit/config
@ -0,0 +1,9 @@
+#cloud-config
+cloud_config_modules:
+ - locale
+ - scripts_user
+ - set_hostname
+ - ssh
+ - timezone
+ - update_etc_hosts
+ - update_hostname
--- a/heat/cloudinit/part-handler.py
+++ b/heat/cloudinit/part-handler.py
@ -0,0 +1,14 @@
+#part-handler
+def list_types():
+    return(["text/x-cfninitdata"])
+
+def handle_part(data,ctype,filename,payload):
+    if ctype == "__begin__":
+       return
+    if ctype == "__end__":
+       return
+
+    if ctype == 'text/x-cfninitdata':
+        f = open('/var/lib/cloud/data/%s' % filename, 'w')
+        f.write(payload)
+        f.close()
--- 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;/usr/sbin/useradd ec2-user;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>
--- a/heat/jeos/F16-x86_64-cfntools-jeos.tdl
+++ b/heat/jeos/F16-x86_64-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;/usr/sbin/useradd ec2-user;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/cfn-*
 #!/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>
--- a/heat/jeos/F17-i386-cfntools-jeos.tdl
+++ b/heat/jeos/F17-i386-cfntools-jeos.tdl
@ -12,44 +12,9 @@
  <description>Fedora 17</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;/usr/sbin/useradd ec2-user;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/cfn-*
 #!/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>
--- a/heat/jeos/F17-x86_64-cfntools-jeos.tdl
+++ b/heat/jeos/F17-x86_64-cfntools-jeos.tdl
@ -12,45 +12,9 @@
  <description>Fedora 17</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;/usr/sbin/useradd ec2-user;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/cfn-*
 #!/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-*
-/tmp/startup
 EOF
    </command>
  </commands>