summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-09-07 22:26:35 -0400
committerTim Rozet <trozet@redhat.com>2016-09-11 00:42:16 +0000
commit8d121bd212e984072667320639f6712f1f164c79 (patch)
treef0dca98317d52a40e9c43837eb1cda5919887719 /lib
parent7d53e2e0960d7c0f06f9e1f03f7baa261f2b1c15 (diff)
Enables networking-vpp in nosdn-fdio scenario
- Add puppet neutron support for configuring both ML2 driver and networking-vpp agent - Update THT to invoke new puppet classes. JIRA: APEX-261 opnfv-tht-pr: 76 Change-Id: Iab21713eb711e9f24fa66cba30c895e43a3e945e Signed-off-by: Feng Pan <fpan@redhat.com> (cherry picked from commit d327766d7e7ff91f4ed1a11cfcda70254420f524)
Diffstat (limited to 'lib')
-rwxr-xr-xlib/overcloud-deploy-functions.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 53c7eef2..e278a68e 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -52,6 +52,9 @@ function overcloud_deploy {
exit 1
elif [[ -z "${deploy_options_array['sdn_controller']}" || "${deploy_options_array['sdn_controller']}" == 'False' ]]; then
echo -e "${blue}INFO: SDN Controller disabled...will deploy nosdn scenario${reset}"
+ if [ "${deploy_options_array['vpp']}" == 'True' ]; then
+ DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-ml2-networking-vpp.yaml"
+ fi
SDN_IMAGE=opendaylight
else
echo "${red}Invalid sdn_controller: ${deploy_options_array['sdn_controller']}${reset}"