From 8ac1c0fa491ab5de2eaf128374f9c73202df1751 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 26 Jul 2018 00:08:28 +0200 Subject: [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 --- mcp/scripts/salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mcp') 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' -- cgit 1.2.3-korg