aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/scripts/salt.sh
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-07-12 12:29:30 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-07-12 13:39:17 +0400
commitd676c91a67684a7efb317d58429c49db7c562473 (patch)
treedd9c4b19f666825d15d4b08845bcd14cfe91ab93 /mcp/scripts/salt.sh
parent5005e2f8a9c4d9bb10feeea61d8e5651d76fc2b7 (diff)
Apply reclass patches before salt master init
Change-Id: I7bb984880e98b7bdec9aa0b3895a3be9fd75cac0 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/scripts/salt.sh')
-rwxr-xr-xmcp/scripts/salt.sh15
1 files changed, 7 insertions, 8 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index c87645024..605da89ee 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -17,21 +17,20 @@ ssh ${SSH_OPTS} ubuntu@${SALT_MASTER} bash -s << SALT_INSTALL_END
git clone --depth=1 --recurse-submodules https://git.opnfv.org/fuel
ln -s /root/fuel/mcp/reclass /srv/salt/reclass
+ mkdir -p /usr/share/salt-formulas/reclass
+ cp -r /root/fuel/mcp/metadata/service /usr/share/salt-formulas/reclass
+ cd /srv/salt/reclass/classes/service && ln -s /usr/share/salt-formulas/reclass/service/opendaylight
+ cd /root/fuel/mcp/patches && ./patch.sh patches.list reclass
+
cd /srv/salt/scripts
MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly ./salt-master-init.sh
salt-key -Ay
- cp -r /root/fuel/mcp/metadata/service /usr/share/salt-formulas/reclass
cp -r /root/fuel/mcp/salt-formulas/* /usr/share/salt-formulas/env
- cd /srv/salt/reclass/classes/service && ln -s /usr/share/salt-formulas/reclass/service/opendaylight
-
- cd /root/fuel/mcp/patches && ./patch.sh patches.list
-
- salt '*' saltutil.refresh_pillar
- salt '*' saltutil.sync_all
+ cd /root/fuel/mcp/patches && ./patch.sh patches.list formulas
salt-call state.apply salt
- salt '*' state.apply salt || salt '*' state.apply salt
+ salt '*' state.apply salt | fgrep -q 'No response' && salt '*' state.apply salt
salt -C 'I@salt:master' state.sls linux
salt -C '* and not cfg01*' state.sls linux