summaryrefslogtreecommitdiffstats
path: root/mcp/scripts/salt.sh
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-14 22:47:45 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-15 18:56:07 +0000
commit644dc6a6cd8c4a309352a2b2602d757f4acbf63b (patch)
treefe4f70468e0ca7b0c3685bd6ba422b14d81b72fa /mcp/scripts/salt.sh
parent94825e25dcc5bf4a8490690fc1cf423df0e9d7fe (diff)
states: Break on error, retry states up to 5 times
While applying scenario states, break on error, and retry failed state up to 5 times. Apply the same behavior for `salt.sh`. Add new deploy parameter, '-D', backed up by 'CI_DEBUG' env var, which gates deploy sh scripts logging (set -x). Also extend '-f' deploy parameter, allowing it to be specified more than once; the first occurence will skip infra VM creation, but still sync reclass & other config from local repo, while a second occurence will also disable config sync. To prevent glusterfs client state from failing due to non-existent nova user/group, move it after nova:compute's nova state is applied. Change-Id: I234e126e16be0e133d878957bd88fed946955de8 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 23f9ef727310a8ef449372313785241df6557559)
Diffstat (limited to 'mcp/scripts/salt.sh')
-rwxr-xr-xmcp/scripts/salt.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index df0ef70fb..3bb17f0cd 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
##############################################################################
# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
# All rights reserved. This program and the accompanying materials
@@ -10,6 +10,7 @@
# Deploy Salt Master
#
+CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
F_GIT_ROOT=$(git rev-parse --show-toplevel)
OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/fuel"
OPNFV_FUEL_DIR="/root/fuel"
@@ -37,14 +38,15 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END
echo ' done'
mkdir -p /srv/salt /usr/share/salt-formulas/reclass
+ rm -rf ${OPNFV_FUEL_DIR}
mv ${OPNFV_TMP_DIR} ${OPNFV_FUEL_DIR} && chown -R root.root ${OPNFV_FUEL_DIR}
- ln -s ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt/reclass
- ln -s ${OPNFV_FUEL_DIR}/mcp/deploy/scripts /srv/salt/scripts
- cd /srv/salt/${OPNFV_RDIR} && ln -s "\$(uname -i)" arch
+ ln -sf ${OPNFV_FUEL_DIR}/mcp/reclass /srv/salt
+ ln -sf ${OPNFV_FUEL_DIR}/mcp/deploy/scripts /srv/salt
+ cd /srv/salt/${OPNFV_RDIR} && rm -f arch && ln -sf "\$(uname -i)" arch
cp -r ${OPNFV_FUEL_DIR}/mcp/metadata/service /usr/share/salt-formulas/reclass
cd /srv/salt/reclass/classes/service && \
- ln -s /usr/share/salt-formulas/reclass/service/opendaylight
+ ln -sf /usr/share/salt-formulas/reclass/service/opendaylight
cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass
cd /srv/salt/scripts