diff options
| author |   Michael Chapman <michapma@redhat.com> | 2016-02-24 01:23:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-02-24 01:23:00 +0000 |
| commit | 57944a996c0e546c3726d70d55ad16912fe9fbb8 (patch) | |
| tree | d701a3c14183eaf438c59d783ef8d00727871eb3 /ci | |
| parent | 44844d6fe06da44575ad4e9ffd59e39bbbee1df2 (diff) | |
| parent | c86bd1f24647646b7489cd72e0a0bb91f4a505f1 (diff) | |
Merge "Adding SDNVPN support"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index c89dd584..1b8f36f0 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -304,8 +304,8 @@ parse_inventory_file() { fi eval $(parse_yaml $INVENTORY_FILE) || { - echo "${red}Failed to parse inventory.yaml. Aborting.${reset}" && - exit 1 + echo "${red}Failed to parse inventory.yaml. Aborting.${reset}" && + exit 1 } instack_env_output=" @@ -801,6 +801,8 @@ function undercloud_prep_overcloud_deploy { DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_l3.yaml" elif [ "${deploy_options_array['sfc']}" == 'true' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sfc.yaml" + elif [ "${deploy_options_array['vpn']}" == 'true' ]; then + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml" else DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml" fi @@ -884,6 +886,7 @@ function undercloud_prep_overcloud_deploy { if [ "$debug" == 'TRUE' ]; then LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex fi + source stackrc set -o errexit echo "Uploading overcloud glance images" |