nsm: Minor fixes to NSM packer template

[infra/tools.git] / infra / jenkins / slave-setup / nordix-nsm-build-server / configure-image-ubuntu1804.sh

diff --git a/infra/jenkins/slave-setup/nordix-nsm-build-server/configure-image.sh b/infra/jenkins/slave-setup/nordix-nsm-build-server/configure-image-ubuntu1804.sh
similarity index 92%
rename from infra/jenkins/slave-setup/nordix-nsm-build-server/configure-image.sh
rename to infra/jenkins/slave-setup/nordix-nsm-build-server/configure-image-ubuntu1804.sh
index b1ce3c7d456535c5804bf148dfa0b842fffff20e..76a7e6c10cb5d5fdbf6c3b5dd915cdaad866c095 100644 (file)
--- a/infra/jenkins/slave-setup/nordix-nsm-build-server/configure-image.sh
+++ b/infra/jenkins/slave-setup/nordix-nsm-build-server/configure-image-ubuntu1804.sh
@@ -63,11 +63,17 @@ sudo systemctl restart sshd
 sudo bash -c 'cat << EOF > /var/lib/cloud/scripts/per-instance/copykeystojenkins.sh
 #!/bin/bash
 sudo mkdir -p /home/jenkins/.ssh
+# append ssh key injected by openstack to authorized_keys
 sudo cat /home/ubuntu/.ssh/authorized_keys >> /home/jenkins/.ssh/authorized_keys
+# append user ssh public keys uploaded by packer to authorized_keys
+sudo cat /home/ubuntu/authorized_keys.packer >> /home/jenkins/.ssh/authorized_keys
+# remove /home/ubuntu/authorized_keys.packer
+sudo rm -f /home/jenkins/authorized_keys.packer
 sudo chown -R jenkins:jenkins /home/jenkins/.ssh
 sudo chmod -R go-rwx /home/jenkins/.ssh
 sudo userdel -f -r ubuntu
 EOF'
+
 sudo chmod +x /var/lib/cloud/scripts/per-instance/copykeystojenkins.sh
 
 # vim: set ts=2 sw=2 expandtab: