aboutsummaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2018-03-16 16:22:46 -0400
committerTim Rozet <trozet@redhat.com>2018-04-12 14:08:27 +0000
commit3df29834f02d09d4976ca42dbe04d494506848da (patch)
treeb94bd71bc925603bea62394d0fbc8256b3301f69 /environments
parent01db62fd83df2af8b7d87280919a435ee43dc40f (diff)
Add vpp-router config to vpp ml2 environment file
Change-Id: I5dfaf85d67fb038109edaf5c5d8a3e901b9148f4 Signed-off-by: Feng Pan <fpan@redhat.com> (cherry picked from commit afa11d5946303191d2791b0751d34b9e7d66d9c5)
Diffstat (limited to 'environments')
-rw-r--r--environments/neutron-ml2-vpp.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/environments/neutron-ml2-vpp.yaml b/environments/neutron-ml2-vpp.yaml
index 1dec395c..e497013c 100644
--- a/environments/neutron-ml2-vpp.yaml
+++ b/environments/neutron-ml2-vpp.yaml
@@ -6,6 +6,7 @@ resource_registry:
OS::TripleO::Services::NeutronVppAgent: ../puppet/services/neutron-vpp-agent.yaml
OS::TripleO::Services::Etcd: ../puppet/services/etcd.yaml
OS::TripleO::Services::Vpp: ../puppet/services/vpp.yaml
+ OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
parameter_defaults:
#Comma delimited list of <physical_network>:<VPP Interface>.
@@ -14,7 +15,7 @@ parameter_defaults:
NeutronMechanismDrivers: vpp
NeutronNetworkType: vlan
- NeutronServicePlugins: router
+ NeutronServicePlugins: vpp-router
NeutronTypeDrivers: vlan,flat
ExtraConfig:
# Use Linux Bridge driver for DHCP and L3 agent.