diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-06-28 14:47:29 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-06-28 15:22:18 +0400 |
| commit | 8f3be1619a32b7c57f62a4b389e80b51b10b74a6 (patch) | |
| tree | 8012ef0ce4e0f72764750a31088d9e4496a04b19 | |
| parent | 3c7e4c3773face367cdf0988cccfc2dfd68f55ab (diff) | |
Get latest salt-formulas code
Change-Id: I6284589343bfcdc4f35734d5c291ad0a2bf02d74
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
| -rwxr-xr-x | mcp/reclass/scripts/openstack.sh | 1 | ||||
| -rwxr-xr-x | mcp/reclass/scripts/salt.sh | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mcp/reclass/scripts/openstack.sh b/mcp/reclass/scripts/openstack.sh index 9e636ddaa..af4419147 100755 --- 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 b6f844e83..cf118e682 100755 --- 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 |