summaryrefslogtreecommitdiffstats
path: root/mcp/scripts/lib.sh
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-06 17:55:04 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-06 23:30:06 +0100
commitb6689c3e319b66b64bc0fe49366dfdeb4152e664 (patch)
tree9ca494dd17b279f162d8596130ef48a262de8ee5 /mcp/scripts/lib.sh
parent3d2c66ead4bdb1179d8ae9b9307c633b9de58298 (diff)
[virtual] Add missing ODL dhcp_int
- add missing network definitions for ODL node's 1st interface; - add missing comments for `notify` global functions; - fix or silence shellcheck issues; JIRA: FUEL-322 Change-Id: Ie3341d29ab12ddf432db603ad865259afb54714e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/scripts/lib.sh')
-rw-r--r--mcp/scripts/lib.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 02c23f365..5b00c7380 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -1,5 +1,5 @@
#!/bin/bash -e
-# shellcheck disable=SC2155,SC1001
+# shellcheck disable=SC2155,SC1001,SC2015
##############################################################################
# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
# All rights reserved. This program and the accompanying materials
@@ -452,7 +452,7 @@ function wait_for {
# shellcheck disable=SC2015
eval "${cmdstr}" && echo "[wait_for] OK: ${cmdstr}" && return 0 || true
else
- !(eval "${cmdstr}" || echo __fuel_wf_failure__) |& tee /dev/stderr | \
+ ! (eval "${cmdstr}" || echo __fuel_wf_failure__) |& tee /dev/stderr | \
grep -Eq '(Not connected|No response|__fuel_wf_failure__)' && \
echo "[wait_for] OK: ${cmdstr}" && return 0 || true
fi
@@ -498,7 +498,6 @@ function do_templates() {
BASE_CONFIG_IDF="${lab_config_uri}/labs/${target_lab}/idf-${target_pod}.yaml"
LOCAL_PDF="${image_dir}/$(basename "${BASE_CONFIG_PDF}")"
LOCAL_IDF="${image_dir}/$(basename "${BASE_CONFIG_IDF}")"
- LOCAL_PDF_RECLASS="${image_dir}/pod_config.yml"
# Two-stage expansion, first stage handles pod_config and scenarios only
if [ -n "${scenario_dir}" ]; then
@@ -511,7 +510,7 @@ function do_templates() {
elif ! curl -o "${LOCAL_IDF}" "${BASE_CONFIG_IDF}"; then
notify_e "[ERROR] Could not retrieve IDF (Installer Descriptor File)!"
elif ! "${PHAROS_GEN_CFG}" -y "${LOCAL_PDF}" \
- -j "${PHAROS_INSTALLER_ADAPTER}" > "${LOCAL_PDF_RECLASS}"; then
+ -j "${PHAROS_INSTALLER_ADAPTER}" > "${image_dir}/pod_config.yml"; then
notify_e "[ERROR] Could not convert PDF+IDF to reclass model input!"
fi
template_dirs="${scenario_dir}"