summaryrefslogtreecommitdiffstats
path: root/ci/deploy.sh
diff options
context:
space:
mode:
Diffstat (limited to 'ci/deploy.sh')
-rwxr-xr-xci/deploy.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 218fe9e..31cd462 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -301,8 +301,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="
@@ -798,6 +798,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
@@ -881,6 +883,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"