From 8aa52863e3b93a794b846a4627cdfe8f3237b60d Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 1 Mar 2018 16:38:18 +0100 Subject: [PATCH] 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 --- teuthology/openstack/openstack-sle-15.0-user-data.txt | 2 +- teuthology/task/buildpackages/sle-15.0-user-data.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/teuthology/openstack/openstack-sle-15.0-user-data.txt b/teuthology/openstack/openstack-sle-15.0-user-data.txt index 9a1bed9ee9..68d4cbe394 100644 --- 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 b6c3357b96..895ff1b2e4 100644 --- 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" -- 2.39.5