openstack/buildpackages: tweaked opensuse 42.2 user-data

Fixes: https://github.com/SUSE/teuthology/issues/54
Signed-off-by: Nathan Cutler <ncutler@suse.com>

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

diff --git a/teuthology/openstack/openstack-opensuse-42.2-user-data.txt b/teuthology/openstack/openstack-opensuse-42.2-user-data.txt
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..0bd4de0eca6b056ad369bddf64546828b7e470ec
--- /dev/null
+++ b/teuthology/openstack/openstack-opensuse-42.2-user-data.txt
@@ -0,0 +1,28 @@
+#cloud-config
+bootcmd:
+ - echo nameserver {nameserver} | tee /etc/resolv.conf
+ - echo search {lab_domain} | tee -a /etc/resolv.conf
+ - sed -i -e 's/PEERDNS="yes"/PEERDNS="no"/' /etc/sysconfig/network/ifcfg-eth0
+ - ( curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//' ; eval printf "%03d%03d%03d%03d.{lab_domain}" $(curl --silent http://169.254.169.254/2009-04-04/meta-data/local-ipv4 | tr . ' ' ) ) | tee /etc/hostname
+ - hostname $(cat /etc/hostname)
+ - ( echo ; echo "MaxSessions 1000" ) >> /etc/ssh/sshd_config
+# See https://github.com/ceph/ceph-cm-ansible/blob/master/roles/cobbler/templates/snippets/cephlab_user
+ - ( echo 'Defaults !requiretty' ; echo 'Defaults visiblepw' ) | tee /etc/sudoers.d/cephlab_sudo ; chmod 0440 /etc/sudoers.d/cephlab_sudo
+preserve_hostname: true
+users:
+  - name: {username}
+    gecos: User
+    sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+    groups: users
+runcmd:
+ - ( MYHOME=/home/{username} ; mkdir $MYHOME/.ssh ; chmod 700 $MYHOME/.ssh ; cp /root/.ssh/authorized_keys $MYHOME/.ssh ; chown -R {username}.users $MYHOME/.ssh )
+ - 'zypper rr openSUSE-Leap-Cloud-Tools || :'
+ - zypper --non-interactive --no-gpg-checks refresh
+ - zypper --non-interactive remove systemd-logger
+ - zypper --non-interactive install --no-recommends python wget git ntp rsyslog
+   lsb-release salt-minion salt-master make
+ - sed -i -e "s/^#master:.*$/master:\ $(curl --silent http://169.254.169.254/2009-04-04/meta-data/hostname | sed -e 's/[\.-].*//')$(eval printf "%03d%03d%03d%03d.{lab_domain}" $(echo "{nameserver}" | tr . ' '))/" /etc/salt/minion
+ - ( if ! grep '^server' /etc/ntp.conf ; then for i in 0 1 2 3 ; do echo "server $i.opensuse.pool.ntp.org iburst" >> /etc/ntp.conf ; done ; fi )
+ - systemctl enable salt-minion.service ntpd.service
+ - systemctl restart ntpd.service
+final_message: "{up}, after $UPTIME seconds"

diff --git a/teuthology/task/buildpackages/opensuse-42.2-user-data.txt b/teuthology/task/buildpackages/opensuse-42.2-user-data.txt
deleted file mode 120000 (symlink)
index fbc545c065cc92ef1d13e2f16d240db2dd8ce2b8..0000000000000000000000000000000000000000
--- a/teuthology/task/buildpackages/opensuse-42.2-user-data.txt
+++ /dev/null
@@ -1 +0,0 @@
-opensuse-42.1-user-data.txt
\ No newline at end of file

diff --git a/teuthology/task/buildpackages/opensuse-42.2-user-data.txt b/teuthology/task/buildpackages/opensuse-42.2-user-data.txt
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..fd35c9db0270adced2e56aeb01dc140e3e570cc1
--- /dev/null
+++ b/teuthology/task/buildpackages/opensuse-42.2-user-data.txt
@@ -0,0 +1,14 @@
+#cloud-config
+bootcmd:
+ - echo nameserver 8.8.8.8 | tee -a /etc/resolv.conf # last resort, in case the DHCP server does not provide a resolver
+manage_etc_hosts: true
+preserve_hostname: true
+users:
+  - name: ubuntu
+    gecos: User
+    sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+    groups: users
+runcmd:
+ - ( MYHOME=/home/ubuntu ; mkdir $MYHOME/.ssh ; chmod 700 $MYHOME/.ssh ; cp /root/.ssh/authorized_keys $MYHOME/.ssh ; chown -R ubuntu.users $MYHOME/.ssh )
+ - 'zypper rr openSUSE-Leap-Cloud-Tools || :'
+final_message: "READYTORUN"