From: Feng Pan <fpan@redhat.com>
Date: Mon, 21 Nov 2016 19:28:23 +0000 (-0500)
Subject: puppet-fdio: add check for existance of ssh key before generating new one
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=4cf6c5580ed386c070fcc72465b703f145e2ee9e;p=ci-management.git

puppet-fdio: add check for existance of ssh key before generating new one

Change-Id: I69fca1d480e2f89e059f29aeef681ae63e9796d3
Signed-off-by: Feng Pan <fpan@redhat.com>
---

diff --git a/jjb/puppet-fdio/puppet-fdio.yaml b/jjb/puppet-fdio/puppet-fdio.yaml
index 4f0de022c..d34f2c17d 100644
--- a/jjb/puppet-fdio/puppet-fdio.yaml
+++ b/jjb/puppet-fdio/puppet-fdio.yaml
@@ -143,7 +143,6 @@
     name: allow-local-ssh-root
     builders:
       - shell: |
-          #!/bin/bash
           echo "" | sudo tee -a /etc/ssh/sshd_config
           echo "Match address 127.0.0.1" | sudo tee -a /etc/ssh/sshd_config
           echo "    PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
@@ -151,7 +150,9 @@
           echo "Match address ::1" | sudo tee -a /etc/ssh/sshd_config
           echo "    PermitRootLogin without-password" | sudo tee -a /etc/ssh/sshd_config
           mkdir -p .ssh
-          ssh-keygen -f ~/.ssh/id_rsa -b 2048 -P ""
+          if [ ! -f ~/.ssh/id_rsa ]; then
+              ssh-keygen -f ~/.ssh/id_rsa -b 2048 -P ""
+          fi
           sudo mkdir -p /root/.ssh
           cat ~/.ssh/id_rsa.pub | sudo tee -a /root/.ssh/authorized_keys
           if [ -f /usr/bin/yum ]; then