From: Nathan Cutler <ncutler@suse.com>
Date: Wed, 14 Mar 2018 22:25:27 +0000 (+0100)
Subject: openstack: user-data: install chrony on SLE15 and openSUSE 15
X-Git-Tag: 1.1.0~211^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f9d23d7c959d8478779e974dc99d3893358e883e;p=teuthology.git

openstack: user-data: install chrony on SLE15 and openSUSE 15

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
index f81c3376a..9a685e662 100644
--- a/teuthology/openstack/openstack-opensuse-15.0-user-data.txt
+++ b/teuthology/openstack/openstack-opensuse-15.0-user-data.txt
@@ -19,7 +19,10 @@ runcmd:
  - zypper --non-interactive addrepo https://download.opensuse.org/repositories/filesystems:/ceph:/mimic/openSUSE_Leap_15.0/filesystems:ceph:mimic.repo
  - zypper --non-interactive --gpg-auto-import-keys refresh
  - zypper --non-interactive remove librados2 librbd1 multipath-tools-rbd qemu-block-rbd
- - zypper --non-interactive install --no-recommends wget git-core rsyslog lsb-release make gcc gcc-c++ salt-master salt-minion salt-api
+ - zypper --non-interactive install --no-recommends wget git-core rsyslog lsb-release make gcc gcc-c++ salt-master salt-minion salt-api chrony
+ - sed -i -e 's/^! pool/pool/' /etc/chrony.conf
+ - systemctl enable chronyd.service
+ - systemctl start chronyd.service
  - 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
  - sleep 30
 final_message: "{up}, after $UPTIME seconds"
diff --git a/teuthology/openstack/openstack-sle-15.0-user-data.txt b/teuthology/openstack/openstack-sle-15.0-user-data.txt
index 68d4cbe39..f76d39aa7 100644
--- a/teuthology/openstack/openstack-sle-15.0-user-data.txt
+++ b/teuthology/openstack/openstack-sle-15.0-user-data.txt
@@ -17,6 +17,9 @@ 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++
+ - zypper --non-interactive install --no-recommends wget rsyslog lsb-release make gcc gcc-c++ chrony
+ - sed -i -e 's/^! pool/pool/' /etc/chrony.conf
+ - systemctl enable chronyd.service
+ - systemctl start chronyd.service
  - 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/task/buildpackages/sle-15.0-user-data.txt b/teuthology/task/buildpackages/sle-15.0-user-data.txt
index 895ff1b2e..b837125c8 100644
--- a/teuthology/task/buildpackages/sle-15.0-user-data.txt
+++ b/teuthology/task/buildpackages/sle-15.0-user-data.txt
@@ -10,5 +10,5 @@ users:
     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
+ - zypper --non-interactive --no-gpg-checks install --no-recommends wget git-core rsyslog lsb-release
 final_message: "READYTORUN"