diff options
Diffstat (limited to 'mcp/reclass')
| -rwxr-xr-x | mcp/reclass/scripts/openstack.sh | 1 | ||||
| -rwxr-xr-x | mcp/reclass/scripts/salt.sh | 7 |
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 |