openstack: add support for ubuntu 12.04

Workaround the bug in cloud-init 0.6.3 that prevents the final message
from being
displayed (https://bugs.launchpad.net/cloud-init/+bug/1511485). Also
make the Ubuntu 14.04 user-data file not a symlink since it looks like
each version will need its own.

http://tracker.ceph.com/issues/13520 Fixes: #13520

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index 36ab6826508d8dcaca3d02fb2d2ffac147ede480..806b894a55f79f760a8836b56d9be725be273d6e 100644 (file)
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -60,6 +60,7 @@ class OpenStack(object):
     image2url = {
         'centos-6.5': 'http://cloud.centos.org/centos/6/images/CentOS-6-x86_64-GenericCloud-1508.qcow2',
         'centos-7.0': 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1508.qcow2',
+        'ubuntu-12.04': 'https://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img',
         'ubuntu-14.04': 'https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img',
         'debian-8.0': 'http://cdimage.debian.org/cdimage/openstack/current/debian-8.2.0-openstack-amd64.qcow2',
     }

diff --git a/teuthology/openstack/openstack-ubuntu-12.04-user-data.txt b/teuthology/openstack/openstack-ubuntu-12.04-user-data.txt
new file mode 100644 (file)
index 0000000..0f1c836
--- /dev/null
+++ b/teuthology/openstack/openstack-ubuntu-12.04-user-data.txt
@@ -0,0 +1,21 @@
+#cloud-config
+bootcmd:
+ - apt-get remove --purge -y resolvconf || true
+ - echo 'prepend domain-name-servers {nameserver};' | sudo tee -a /etc/dhcp/dhclient.conf
+ - echo 'supersede domain-name "{lab_domain}";' | sudo tee -a /etc/dhcp/dhclient.conf
+ - ifdown eth0 ; ifup eth0
+ - ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | sed -e 's/.*\.\(.*\)\.\(.*\)/\1 \2/') ) | tee /etc/hostname
+ - hostname $(cat /etc/hostname)
+ - echo "MaxSessions 1000" >> /etc/ssh/sshd_config
+preserve_hostname: true
+system_info:
+  default_user:
+    name: {username}
+packages:
+ - python
+ - wget
+ - git
+ - ntp
+runcmd:
+ - dpkg -l python wget git ntp >> /var/log/cloud-init-output.log
+ - echo "{up}" >> /var/log/cloud-init-output.log

diff --git a/teuthology/openstack/openstack-ubuntu-14.04-user-data.txt b/teuthology/openstack/openstack-ubuntu-14.04-user-data.txt
deleted file mode 120000 (symlink)
index a51b0cc9bcda9768b680a3533cb5efc355be46d4..0000000000000000000000000000000000000000
--- a/teuthology/openstack/openstack-ubuntu-14.04-user-data.txt
+++ /dev/null
@@ -1 +0,0 @@
-openstack-ubuntu-user-data.txt
\ No newline at end of file

diff --git a/teuthology/openstack/openstack-ubuntu-14.04-user-data.txt b/teuthology/openstack/openstack-ubuntu-14.04-user-data.txt
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..e05f1ade9bf1e95ecde2a78719c3042b8479ae35
--- /dev/null
+++ b/teuthology/openstack/openstack-ubuntu-14.04-user-data.txt
@@ -0,0 +1,19 @@
+#cloud-config
+bootcmd:
+ - apt-get remove --purge -y resolvconf || true
+ - echo 'prepend domain-name-servers {nameserver};' | sudo tee -a /etc/dhcp/dhclient.conf
+ - echo 'supersede domain-name "{lab_domain}";' | sudo tee -a /etc/dhcp/dhclient.conf
+ - ifdown eth0 ; ifup eth0
+ - ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | sed -e 's/.*\.\(.*\)\.\(.*\)/\1 \2/') ) | tee /etc/hostname
+ - hostname $(cat /etc/hostname)
+ - echo "MaxSessions 1000" >> /etc/ssh/sshd_config
+preserve_hostname: true
+system_info:
+  default_user:
+    name: {username}
+packages:
+ - python
+ - wget
+ - git
+ - ntp
+final_message: "{up}, after $UPTIME seconds"

diff --git a/teuthology/openstack/openstack-ubuntu-user-data.txt b/teuthology/openstack/openstack-ubuntu-user-data.txt
deleted file mode 100644 (file)
index e05f1ad..0000000
--- a/teuthology/openstack/openstack-ubuntu-user-data.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-#cloud-config
-bootcmd:
- - apt-get remove --purge -y resolvconf || true
- - echo 'prepend domain-name-servers {nameserver};' | sudo tee -a /etc/dhcp/dhclient.conf
- - echo 'supersede domain-name "{lab_domain}";' | sudo tee -a /etc/dhcp/dhclient.conf
- - ifdown eth0 ; ifup eth0
- - ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | sed -e 's/.*\.\(.*\)\.\(.*\)/\1 \2/') ) | tee /etc/hostname
- - hostname $(cat /etc/hostname)
- - echo "MaxSessions 1000" >> /etc/ssh/sshd_config
-preserve_hostname: true
-system_info:
-  default_user:
-    name: {username}
-packages:
- - python
- - wget
- - git
- - ntp
-final_message: "{up}, after $UPTIME seconds"