diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-07-26 00:08:28 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-07-26 00:08:28 +0200 |
| commit | 8ac1c0fa491ab5de2eaf128374f9c73202df1751 (patch) | |
| tree | 207eb3b1821585e78997ba2aa5913902080e4405 /mcp/scripts/salt.sh | |
| parent | c51c387f8c7d1c9ee03e35822c896432e4d646a0 (diff) | |
[salt master] Disable broken _orchestration.conf
The new orchestration configuration file includes multiple
fragments from all installed formulas; breaking due to an unguarded
dependency include in keystone formula meta/salt.yml.
Temporarily disable the new config generation until fixed upstream.
Change-Id: I8476e5b60b531f08f779df2826b23cd42a043d9b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/scripts/salt.sh')
| -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 6a250dd67..2c56d916f 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' + 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}).*" state.sls linux.system,linux.storage' wait_for 2.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.network' |