Fixing the ssh key option in create_config_drive.sh
Change-Id: I3b4abfc80a955be6990ff4d0809445c07bc8e3d5
diff --git a/config-drive/master_config.sh b/config-drive/master_config.sh
index e472cc0..4ad5083 100644
--- a/config-drive/master_config.sh
+++ b/config-drive/master_config.sh
@@ -107,6 +107,18 @@
fi
}
+failsafe_ssh_key(){
+ if [ -f /mnt/root_auth_keys ]; then
+ echo "Installing failsafe public ssh key from /mnt/root_auth_keys to /root/.ssh/authorized_keys"
+ install -m 0700 -d /root/.ssh
+ cat /mnt/root_auth_keys >> /root/.ssh/authorized_keys
+ chmod 600 /root/.ssh/authorized_keys
+ sed -i 's/^PermitRootLogin.*/PermitRootLogin yes/g' /etc/ssh/sshd_config
+ sed -i 's/^PasswordAuthentication.*/PasswordAuthentication yes/g' /etc/ssh/sshd_config
+ service ssh restart
+ fi
+}
+
# Body ========================================================================
process_network
@@ -118,6 +130,8 @@
chmod -R 644 /srv/salt/reclass/classes/cluster/* || true
chmod -R 644 /srv/salt/reclass/classes/system/* || true
+failsafe_ssh_key
+
echo "Configuring salt"
envsubst < /root/minion.conf > /etc/salt/minion.d/minion.conf
enable_services