From: Nathan Cutler <ncutler@suse.com>
Date: Sat, 3 Mar 2018 20:59:07 +0000 (+0100)
Subject: openstack: support openSUSE Leap 15.0
X-Git-Tag: 1.1.0~250^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9eb80720fed73d9e077345d3a5e391c6d8366ff0;p=teuthology.git

openstack: support openSUSE Leap 15.0

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

diff --git a/teuthology/openstack/openstack-opensuse-15.0-user-data.txt b/teuthology/openstack/openstack-opensuse-15.0-user-data.txt
new file mode 100644
index 000000000..a5412953f
--- /dev/null
+++ b/teuthology/openstack/openstack-opensuse-15.0-user-data.txt
@@ -0,0 +1,22 @@
+#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 --non-interactive --no-gpg-checks refresh
+ - zypper --non-interactive install --no-recommends wget rsyslog lsb-release make gcc gcc-c++ salt-master salt-minion salt-api
+ - 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
+final_message: "{up}, after $UPTIME seconds"
diff --git a/teuthology/orchestra/opsys.py b/teuthology/orchestra/opsys.py
index 57dabd47b..ba44f9125 100644
--- a/teuthology/orchestra/opsys.py
+++ b/teuthology/orchestra/opsys.py
@@ -40,6 +40,7 @@ DISTRO_CODENAME_MAP = {
         "20": "heisenbug",
     },
     "opensuse": {
+        "15.0": "leap",
         "42.2": "leap",
         "42.3": "leap",
     },
@@ -58,8 +59,8 @@ DEFAULT_OS_VERSION = dict(
     ubuntu="18.04",
     fedora="25",
     centos="7.6",
-    opensuse="42.1",
-    sle="12.3",
+    opensuse="15.0",
+    sle="15.0",
     rhel="7.6",
     debian='8.0'
 )
diff --git a/teuthology/task/buildpackages/opensuse-15.0-user-data.txt b/teuthology/task/buildpackages/opensuse-15.0-user-data.txt
new file mode 100644
index 000000000..895ff1b2e
--- /dev/null
+++ b/teuthology/task/buildpackages/opensuse-15.0-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 --non-interactive install --no-recommends wget git-core rsyslog lsb-release
+final_message: "READYTORUN"