diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-07-26 06:41:29 +0000 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-07-26 06:42:00 +0000 |
| commit | db287e06201561d9fc5199bda2815bfabf1840f5 (patch) | |
| tree | af15629d2d63c1748910ace45930a4d583bb6872 /mcp | |
| parent | e0ee4b03e2eca114d6c2a852022df1776cd5b6a4 (diff) | |
Revert "[salt master] Disable broken _orchestration.conf"
This reverts commit 8ac1c0fa491ab5de2eaf128374f9c73202df1751.
Upstream commit has been reverted,
Change-Id: I3b20edd450034dc79ef15b46c1ff845f81aaf981
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp')
| -rwxr-xr-x | mcp/scripts/salt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 2c56d916f..6a250dd67 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -115,7 +115,7 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END wait_for 3.0 '(for n in ${LOCAL_VIRT_NODES}; do salt -C \${n}.* test.ping || exit; done)' fi wait_for 3.0 'salt -C "E@^(${NODE_MASK}|cfg01).*" saltutil.sync_all' - wait_for 3.0 'salt -C "E@^(${NODE_MASK}|cfg01).*" state.apply salt exclude="[{id: /etc/salt/minion.d/_orchestration.conf}]"' + wait_for 3.0 'salt -C "E@^(${NODE_MASK}|cfg01).*" state.apply salt' wait_for 3.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.system,linux.storage' wait_for 2.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.network' |