commit d453a71eeac8474458c6e0f09d31d31901c60ff4
author azvyagintsev <azvyagintsev@mirantis.com> Fri Aug 03 10:50:59 2018 +0200
committer Dzmitry Stremkouski <dstremkouski@mirantis.com> Fri Aug 03 08:56:05 2018 +0000
tree c0aab8849f5c9d96bd8d931fc19263fc35a05275
parent de63c7617e6a8a291e4a608293c9c8afb0e7b143

Workaround fix for maas.region state rerun (First time it fails)
Fix for nonexistent public key for salt minion removal.

Change-Id: Icb2cd93f017b5e7bd8159875cdc9251d9eff03cd

config-drive/master_config.sh

diff --git a/config-drive/master_config.sh b/config-drive/master_config.sh
index 81a8714..e472cc0 100644
--- a/config-drive/master_config.sh
+++ b/config-drive/master_config.sh
@@ -89,7 +89,8 @@
     echo 'WARNING: maas.cluster skipped!'
   fi
   if [[ "$_region" == 'true' ]]; then
-    salt-call ${SALT_OPTS} state.sls maas.region
+    # FIXME MAAS still can fail in rare race condition.
+    salt-call ${SALT_OPTS} state.sls maas.region || salt-call ${SALT_OPTS} state.sls maas.region
   else
     echo 'WARNING: maas.region skipped!'
   fi

config-drive/mirror_config.sh

diff --git a/config-drive/mirror_config.sh b/config-drive/mirror_config.sh
index 6c13993..9b5d2f1 100644
--- a/config-drive/mirror_config.sh
+++ b/config-drive/mirror_config.sh
@@ -56,7 +56,7 @@
 ifup ens3
 
 echo "Configuring salt"
-rm /etc/salt/pki/minion/minion_master.pub
+rm -f /etc/salt/pki/minion/minion_master.pub
 envsubst < /root/minion.conf > /etc/salt/minion.d/minion.conf
 service salt-minion restart