From bd06fe2c225f1d0c6ec165050ab99ea1d0e6946f Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Wed, 31 May 2017 14:49:16 +0200 Subject: [PATCH] openstack: Support Leap 42.3 Without Salt for now, due to https://bugzilla.opensuse.org/show_bug.cgi?id=1042379 Signed-off-by: Nathan Cutler --- teuthology/openstack/__init__.py | 1 + .../openstack-opensuse-42.3-user-data.txt | 27 +++++++++++++++++++ .../buildpackages/opensuse-42.3-user-data.txt | 1 + 3 files changed, 29 insertions(+) create mode 100644 teuthology/openstack/openstack-opensuse-42.3-user-data.txt create mode 120000 teuthology/task/buildpackages/opensuse-42.3-user-data.txt diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py index 8e453829ee..63c1cebfee 100644 --- a/teuthology/openstack/__init__.py +++ b/teuthology/openstack/__init__.py @@ -198,6 +198,7 @@ class OpenStack(object): 'centos-7.3-x86_64': 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1701.qcow2', 'opensuse-42.1-x86_64': 'http://download.opensuse.org/repositories/Cloud:/Images:/Leap_42.1/images/openSUSE-Leap-42.1-OpenStack.x86_64.qcow2', 'opensuse-42.2-x86_64': 'http://download.opensuse.org/repositories/Cloud:/Images:/Leap_42.2/images/openSUSE-Leap-42.2-OpenStack.x86_64.qcow2', + 'opensuse-42.3-x86_64': 'http://download.opensuse.org/repositories/Cloud:/Images:/Leap_42.3/images/openSUSE-Leap-42.3-OpenStack.x86_64.qcow2', 'ubuntu-14.04-x86_64': 'https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img', 'ubuntu-14.04-aarch64': 'https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-arm64-disk1.img', 'ubuntu-14.04-i686': 'https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-i386-disk1.img', diff --git a/teuthology/openstack/openstack-opensuse-42.3-user-data.txt b/teuthology/openstack/openstack-opensuse-42.3-user-data.txt new file mode 100644 index 0000000000..62a0e769c4 --- /dev/null +++ b/teuthology/openstack/openstack-opensuse-42.3-user-data.txt @@ -0,0 +1,27 @@ +#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 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 ntpd.service + - systemctl restart ntpd.service +final_message: "{up}, after $UPTIME seconds" diff --git a/teuthology/task/buildpackages/opensuse-42.3-user-data.txt b/teuthology/task/buildpackages/opensuse-42.3-user-data.txt new file mode 120000 index 0000000000..1aa71c4069 --- /dev/null +++ b/teuthology/task/buildpackages/opensuse-42.3-user-data.txt @@ -0,0 +1 @@ +opensuse-42.2-user-data.txt \ No newline at end of file -- 2.39.5