From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Thu, 26 Jul 2018 06:41:29 +0000 (+0000)
Subject: Revert "[salt master] Disable broken _orchestration.conf"
X-Git-Tag: opnfv-7.0.0~131
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F99%2F60199%2F2;p=fuel.git

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>
---

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'