sle-15-user-data: copy authorized_keys from root

The image generation script is overriding the disable_root setting in
/etc/cloud/cloud.cfg. As a result, openstack seeds the key in
/root/.ssh/authorized_keys instead of /home/sles/.ssh/authorized_keys

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

diff --git a/teuthology/openstack/openstack-sle-15.0-user-data.txt b/teuthology/openstack/openstack-sle-15.0-user-data.txt
index 9a1bed9ee90edb584e03f11497481af5559bf85a..68d4cbe39420c9f4474e7a76e9ba95327d2276d7 100644 (file)
--- a/teuthology/openstack/openstack-sle-15.0-user-data.txt
+++ b/teuthology/openstack/openstack-sle-15.0-user-data.txt
@@ -15,7 +15,7 @@ users:
     sudo: ["ALL=(ALL) NOPASSWD:ALL"]
     groups: users
 runcmd:
- - ( MYHOME=/home/{username} ; mkdir $MYHOME/.ssh ; chmod 700 $MYHOME/.ssh ; cp /home/sles/.ssh/authorized_keys $MYHOME/.ssh ; chown -R {username}.users $MYHOME/.ssh )
+ - ( 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++
  - 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

diff --git a/teuthology/task/buildpackages/sle-15.0-user-data.txt b/teuthology/task/buildpackages/sle-15.0-user-data.txt
index b6c3357b9644236c3a21c4f4dc0fa63781211d16..895ff1b2e4dd6e00a42c17899d112c0f42af92c1 100644 (file)
--- a/teuthology/task/buildpackages/sle-15.0-user-data.txt
+++ b/teuthology/task/buildpackages/sle-15.0-user-data.txt
@@ -9,6 +9,6 @@ users:
     sudo: ["ALL=(ALL) NOPASSWD:ALL"]
     groups: users
 runcmd:
- - ( MYHOME=/home/ubuntu ; mkdir $MYHOME/.ssh ; chmod 700 $MYHOME/.ssh ; cp /home/sles/.ssh/authorized_keys $MYHOME/.ssh ; chown -R ubuntu.users $MYHOME/.ssh )
+ - ( 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"