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

mirror-image/scripts/mirrors.sh

diff --git a/mirror-image/scripts/mirrors.sh b/mirror-image/scripts/mirrors.sh
index 764597a..8e4bcb3 100644
--- a/mirror-image/scripts/mirrors.sh
+++ b/mirror-image/scripts/mirrors.sh
@@ -9,7 +9,7 @@
 salt-call ${SALT_OPTS} state.sls aptly.publisher
 salt-call ${SALT_OPTS} state.sls aptly || salt-call ${SALT_OPTS} state.sls aptly
 aptly_mirror_update.sh -sv
-aptly-publisher --url http://10.99.0.1:18084 --timeout=1200 publish -v -d -c /etc/aptly-publisher.yaml --architectures amd64 --recreate --force-overwrite
+aptly-publisher --url http://10.99.0.1:18084 --timeout=1200 publish -v -d -c /etc/aptly/publisher.yaml --architectures amd64 --recreate --force-overwrite
 
 #docker registry
 salt-call ${SALT_OPTS} state.sls docker.client.registry