Get latest salt-formulas code

Change-Id: I6284589343bfcdc4f35734d5c291ad0a2bf02d74
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/mcp/reclass/scripts/openstack.sh b/mcp/reclass/scripts/openstack.sh
index 9e636dd..af44191 100755 (executable)
--- a/mcp/reclass/scripts/openstack.sh
+++ b/mcp/reclass/scripts/openstack.sh
@@ -6,7 +6,6 @@
 ssh $SSH_OPTS ubuntu@$SALT_MASTER bash -s << OPENSTACK_INSTALL_END
   sudo -i
 
-  salt-call state.apply salt
   salt '*' state.apply salt || salt '*' state.apply salt
 
   salt -C 'I@salt:master' state.sls linux

diff --git a/mcp/reclass/scripts/salt.sh b/mcp/reclass/scripts/salt.sh
index b6f844e..cf118e6 100755 (executable)
--- a/mcp/reclass/scripts/salt.sh
+++ b/mcp/reclass/scripts/salt.sh
@@ -20,4 +20,9 @@ ssh $SSH_OPTS ubuntu@$SALT_MASTER bash -s << SALT_INSTALL_END
   cd /srv/salt/scripts
   MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} ./salt-master-init.sh
   salt-key -Ay
+
+  salt-call state.apply salt
+  apt dist-upgrade -y
+  salt '*' saltutil.refresh_pillar
+  salt '*' saltutil.sync_all
 SALT_INSTALL_END