From c7302021bdede5f799ebe6f56d7d788d6ced0a1d Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Fri, 4 Mar 2016 12:48:10 +0700 Subject: [PATCH] openstack: openSUSE 42.1 support Signed-off-by: Loic Dachary Signed-off-by: Nathan Cutler --- setup.py | 2 +- teuthology/openstack/__init__.py | 1 + .../openstack-opensuse-42.1-user-data.txt | 24 +++++++++++++++++++ .../openstack-opensuse-user-data.txt | 13 ---------- 4 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 teuthology/openstack/openstack-opensuse-42.1-user-data.txt delete mode 100644 teuthology/openstack/openstack-opensuse-user-data.txt diff --git a/setup.py b/setup.py index a058eae5d1..d517f963ca 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ setup( 'openstack-centos-7.1-user-data.txt', 'openstack-centos-7.2-user-data.txt', 'openstack-debian-8.0-user-data.txt', - 'openstack-opensuse-user-data.txt', + 'openstack-opensuse-42.1-user-data.txt', 'openstack-teuthology.cron', 'openstack-teuthology.init', 'openstack-ubuntu-12.04-user-data.txt', diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py index f929fea293..0b17a433b5 100644 --- a/teuthology/openstack/__init__.py +++ b/teuthology/openstack/__init__.py @@ -193,6 +193,7 @@ class OpenStack(object): 'centos-7.0': 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1503.qcow2', 'centos-7.1': 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1503.qcow2', 'centos-7.2': 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1511.qcow2', + 'opensuse-42.1': 'http://download.opensuse.org/repositories/Cloud:/Images:/Leap_42.1/images/openSUSE-Leap-42.1-OpenStack.x86_64.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-opensuse-42.1-user-data.txt b/teuthology/openstack/openstack-opensuse-42.1-user-data.txt new file mode 100644 index 0000000000..7e25b6d955 --- /dev/null +++ b/teuthology/openstack/openstack-opensuse-42.1-user-data.txt @@ -0,0 +1,24 @@ +#cloud-config +bootcmd: + - echo nameserver {nameserver} | tee /etc/resolv.conf + - echo search {lab_domain} | tee -a /etc/resolv.conf + - sed -ie 's/PEERDNS="yes"/PEERDNS="no"/' /etc/sysconfig/network-scripts/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 ) +packages: + - python + - wget + - git + - ntp +final_message: "{up}, after $UPTIME seconds" diff --git a/teuthology/openstack/openstack-opensuse-user-data.txt b/teuthology/openstack/openstack-opensuse-user-data.txt deleted file mode 100644 index 4071354cf6..0000000000 --- a/teuthology/openstack/openstack-opensuse-user-data.txt +++ /dev/null @@ -1,13 +0,0 @@ -#cloud-config -users: - - name: clouduser - gecos: User - sudo: ["ALL=(ALL) NOPASSWD:ALL"] - groups: users - ssh_pwauth: True -chpasswd: - list: | - clouduser:linux - expire: False -ssh_pwauth: True - -- 2.39.5