commit 29410ee59270b7d5eda5c777aaeb04251dda57fb
author azvyagintsev <azvyagintsev@mirantis.com> Thu Jul 12 20:02:30 2018 +0300
committer azvyagintsev <azvyagintsev@mirantis.com> Fri Jul 13 14:35:24 2018 +0300
tree 184d8e4b66197f86844b2a06cfaf51a44dc683b5
parent f6f87e6e58285598884c6a7477bf3fa832c76dd0

misc updates

  * Wait for salt-master and salt-minion to wake up after restart
  * fix aptly publisher config path
  * refactor cleanup
  * remove multiverse from ubuntu_base.
    It was never packed into offline - so, should be safe to remove.

Change-Id: Ic5bd8d8085af5db10d52063bff50be41031ef248

common/ubuntu_salt_bootstrap.sh

diff --git a/common/ubuntu_salt_bootstrap.sh b/common/ubuntu_salt_bootstrap.sh
index 0b45762..a5a04f3 100644
--- a/common/ubuntu_salt_bootstrap.sh
+++ b/common/ubuntu_salt_bootstrap.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 
-if [ -f '/tmp/done_ubuntu_salt_bootstrap' ]; then
+if [ -f '/done_ubuntu_salt_bootstrap' ]; then
   echo "INFO: ubuntu_salt_bootstrap already finished! Skipping.."
   exit 0
 fi
@@ -62,4 +62,4 @@
   exit 1
 fi
 bash -x /srv/salt/scripts/bootstrap.sh || true
-touch /tmp/done_ubuntu_salt_bootstrap
+touch /done_ubuntu_salt_bootstrap