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
diff --git a/common/ubuntu_cleanup_salt.sh b/common/ubuntu_cleanup_salt.sh
new file mode 100644
index 0000000..4e77783
--- /dev/null
+++ b/common/ubuntu_cleanup_salt.sh
@@ -0,0 +1,28 @@
+#!/bin/bash -xe
+
+apt-get purge salt-formula-* -y
+
+echo "removing all previously accepted salt keys"
+salt-key -D -y || true
+
+echo "cleaning up reclass"
+rm -rf /srv/salt/reclass || true
+rm -rf /srv/salt/scripts || true
+rm -rf /usr/share/salt-formulas/env || true
+#
+mkdir -p /srv/salt/reclass/
+mkdir -p /usr/share/salt-formulas/reclass/service/
+mkdir -p /usr/share/salt-formulas/env/
+
+# stop and disable services, for healthy zerodisk
+# They should be enabled after VCP init
+stop_services="salt-api salt-master salt-minion"
+for s in ${stop_services} ; do
+ systemctl stop ${s} || true
+# Enable this, after refactoring salt:control:virtng
+# systemctl disable ${s} || true
+done
+
+# Clear\drop cache's
+sync
+echo 3 > /proc/sys/vm/drop_caches