From d327766d7e7ff91f4ed1a11cfcda70254420f524 Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Wed, 7 Sep 2016 22:26:35 -0400
Subject: 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>
---
 lib/overcloud-deploy-functions.sh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib')

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}"
-- 
cgit 1.2.3-korg