commit b873ca4828c3d069a6f3898f0fb332d5815d2dd7
author Vasyl Saienko <vsaienko@mirantis.com> Thu Jul 19 19:23:10 2018 +0000
committer Vasyl Saienko <vsaienko@mirantis.com> Thu Jul 19 19:24:17 2018 +0000
tree b4f1f88d9c2ec328aec7ce1484e8872ee3f41633
parent d579f154a861eccd50ee5e75ef798d06f5bd06cc

Revert "Removing salt-key removal - this part is done in packer cleanup task"

This reverts commit d579f154a861eccd50ee5e75ef798d06f5bd06cc.

Related-Prod: PROD-21547

Change-Id: I327b360654c19c50a76dd62c18d3046cbd576a5f

config-drive/master_config.sh

diff --git a/config-drive/master_config.sh b/config-drive/master_config.sh
index 001399f..81a8714 100644
--- a/config-drive/master_config.sh
+++ b/config-drive/master_config.sh
@@ -129,6 +129,11 @@
     sleep 5
 done
 
+sleep 5
+for i in $(salt-key -l accepted | grep -v Accepted | grep -v "$SALT_MASTER_MINION_ID"); do
+    salt-key -d $i -y
+done
+
 find /var/lib/jenkins/jenkins.model.JenkinsLocationConfiguration.xml -type f -print0 | xargs -0 sed -i -e 's/10.167.4.15/'$SALT_MASTER_DEPLOY_IP'/g'
 
 echo "updating local git repos"