diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-06 17:55:04 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-02-06 23:30:06 +0100 |
commit | b6689c3e319b66b64bc0fe49366dfdeb4152e664 (patch) | |
tree | 9ca494dd17b279f162d8596130ef48a262de8ee5 /ci | |
parent | 3d2c66ead4bdb1179d8ae9b9307c633b9de58298 (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 'ci')
-rwxr-xr-x | ci/deploy.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index fb22cc45a..18de570e9 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -288,7 +288,7 @@ do_templates "${REPO_ROOT_PATH}" "${STORAGE_DIR}" "${TARGET_LAB}" \ # Get required infra deployment data based on PDF/IDF (after template parsing) set +x -eval "$(parse_yaml "${LOCAL_PDF_RECLASS}")" +eval "$(parse_yaml "${STORAGE_DIR}/pod_config.yml")" [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x # Serialize vnode data as '<name0>,<ram0>,<vcpu0>|<name1>,<ram1>,<vcpu1>[...]' @@ -346,7 +346,7 @@ else check_connection fi if [ ${USE_EXISTING_INFRA} -lt 2 ]; then - wait_for 5 "./salt.sh ${LOCAL_PDF_RECLASS} ${virtual_nodes[*]}" + wait_for 5 "./salt.sh ${STORAGE_DIR}/pod_config.yml ${virtual_nodes[*]}" fi # Openstack cluster setup |