openstack: user-data: tweak packages on 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
index a5412953f3fb9528dcdae6728f99cc9e84d0001b..d8f615e7e5f63c7c8504d4b32b699eb93fe91aaa 100644 (file)
--- a/teuthology/openstack/openstack-opensuse-15.0-user-data.txt
+++ b/teuthology/openstack/openstack-opensuse-15.0-user-data.txt
@@ -17,6 +17,6 @@ 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
+ - zypper --non-interactive install --no-recommends wget git-core 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/task/buildpackages/opensuse-15.0-user-data.txt b/teuthology/task/buildpackages/opensuse-15.0-user-data.txt
index 895ff1b2e4dd6e00a42c17899d112c0f42af92c1..bb210c4b8eae5186ae176e840fb5e0dce5713727 100644 (file)
--- a/teuthology/task/buildpackages/opensuse-15.0-user-data.txt
+++ b/teuthology/task/buildpackages/opensuse-15.0-user-data.txt
@@ -10,5 +10,6 @@ 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 rm gettext-runtime-mini grub2 grub2-branding-openSUSE grub2-i386-pc grub2-snapper-plugin grub2-systemd-sleep-plugin
+ - zypper --non-interactive --no-gpg-checks install --no-recommends wget git-core rsyslog lsb-release make gcc gcc-c++ grub2 rpm-build
 final_message: "READYTORUN"