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 /ci/deploy.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 'ci/deploy.sh')
| -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 |