From: Feng Pan Date: Fri, 16 Mar 2018 20:22:46 +0000 (-0400) Subject: Add vpp-router config to vpp ml2 environment file X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=afa11d5946303191d2791b0751d34b9e7d66d9c5;p=apex-tripleo-heat-templates.git Add vpp-router config to vpp ml2 environment file Change-Id: I5dfaf85d67fb038109edaf5c5d8a3e901b9148f4 Signed-off-by: Feng Pan --- 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 :. @@ -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. diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index a3cbe851..6e34cf76 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -582,6 +582,7 @@ resources: - cisco_n1kv_data # Optionally provided by Controller/ComputeExtraConfigPre - midonet_data #Optionally provided by AllNodesExtraConfig - cisco_aci_data # Optionally provided by Controller/ComputeExtraConfigPre + - common # Optionally provided by os-net-config merge_behavior: deeper datafiles: service_names: