summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-06-28 16:33:27 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-06-28 16:33:27 +0400
commitcaad7b5e20d66fafb391a37f2bfefc2e654dad6c (patch)
tree611215e0880dbdd877c9e784fa2d37128e5aa400
parent8f3be1619a32b7c57f62a4b389e80b51b10b74a6 (diff)
Set salt bootstrap distrib revision
Change-Id: Id278afd05fd8793f573fce0d4ca1ff7420fc9127 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rwxr-xr-xmcp/reclass/scripts/openstack.sh1
-rwxr-xr-xmcp/reclass/scripts/salt.sh7
2 files changed, 2 insertions, 6 deletions
diff --git a/mcp/reclass/scripts/openstack.sh b/mcp/reclass/scripts/openstack.sh
index af4419147..9e636ddaa 100755
--- a/mcp/reclass/scripts/openstack.sh
+++ b/mcp/reclass/scripts/openstack.sh
@@ -6,6 +6,7 @@
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 cf118e682..3b6fa9900 100755
--- a/mcp/reclass/scripts/salt.sh
+++ b/mcp/reclass/scripts/salt.sh
@@ -18,11 +18,6 @@ ssh $SSH_OPTS ubuntu@$SALT_MASTER bash -s << SALT_INSTALL_END
ln -s /root/fuel/mcp/reclass /srv/salt/reclass
cd /srv/salt/scripts
- MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} ./salt-master-init.sh
+ MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly ./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