user-data: tweak Ubuntu 16.04 user-data

Signed-off-by: Nathan Cutler <ncutler@suse.com>

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

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