diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-02-07 07:51:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-07 07:51:47 +0000 |
| commit | 624e0e31debf1b4f7fa7727826e6e385c6192583 (patch) | |
| tree | e0d9c3aa051c7bf3744dd9752c0dd6afb2225b65 /mcp/scripts/lib.sh | |
| parent | 22bbdf21851c3fdeb10579fc6b0e77a93e90e813 (diff) | |
| parent | b6689c3e319b66b64bc0fe49366dfdeb4152e664 (diff) | |
Merge changes from topic 'fix-public-bridge'
* changes:
[virtual] Add missing ODL dhcp_int
[virsh net] public: rm addr cfg for pure baremetal
Diffstat (limited to 'mcp/scripts/lib.sh')
| -rw-r--r-- | mcp/scripts/lib.sh | 7 |
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}" |