From 633ab23f887ab68951cce4bee8cb71e77a28d461 Mon Sep 17 00:00:00 2001 From: Peng Liu Date: Tue, 14 Mar 2017 14:39:35 +0800 Subject: Add l2gw neutron agent support L2 Gateway (L2GW) is an API framework for OpenStack that offers bridging two or more networks together to make them look at a single broadcast domain. This patch implements the l2gw agent which is one of the backend of the l2 gateway service plugin. Change-Id: I1ae8132ceff9410be7bd82caddf0d14251e720bf Depends-On: If1501c153b1b170b9550cb7e5a23be463fba1fe9 Partially-Implements: blueprint l2gw-service-integration Signed-off-by: Peng Liu --- environments/neutron-l2gw-api.yaml | 20 -------------------- environments/neutron-l2gw.yaml | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 20 deletions(-) delete mode 100644 environments/neutron-l2gw-api.yaml create mode 100644 environments/neutron-l2gw.yaml (limited to 'environments') diff --git a/environments/neutron-l2gw-api.yaml b/environments/neutron-l2gw-api.yaml deleted file mode 100644 index 09894671..00000000 --- a/environments/neutron-l2gw-api.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# A Heat environment file that can be used to deploy Neutron L2 Gateway service -# -# Currently there are only two service provider for Neutron L2 Gateway -# The default option is a dummy driver that allows to enable the API. -# In order to enable other backend, replace the content of L2gwServiceProvider -# -# - L2 gateway agent: L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.rpc_l2gw.L2gwRpcDriver:default -# - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default -resource_registry: - OS::TripleO::Services::NeutronL2gwApi: ../puppet/services/neutron-l2gw-api.yaml - -parameter_defaults: - NeutronServicePlugins: "networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin" - L2gwServiceProvider: ["L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default"] - - # Optional - # L2gwServiceDefaultInterfaceName: - # L2gwServiceDefaultDeviceName: - # L2gwServiceQuotaL2Gateway: - # L2gwServicePeriodicMonitoringInterval: diff --git a/environments/neutron-l2gw.yaml b/environments/neutron-l2gw.yaml new file mode 100644 index 00000000..bba0968a --- /dev/null +++ b/environments/neutron-l2gw.yaml @@ -0,0 +1,27 @@ +# A Heat environment file that can be used to deploy Neutron L2 Gateway service +# +# Currently there are only two service provider for Neutron L2 Gateway +# The default option is a dummy driver that allows to enable the API. +# In order to enable other backend, replace the content of L2gwServiceProvider +# +# - L2 gateway agent: L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.rpc_l2gw.L2gwRpcDriver:default +# - OpenDaylight: L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default +resource_registry: + OS::TripleO::Services::NeutronL2gwApi: ../puppet/services/neutron-l2gw-api.yaml + OS::TripleO::Services::NeutronL2gwAgent: ../puppet/services/neutron-l2gw-agent.yaml + +parameter_defaults: + NeutronServicePlugins: "networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin" + L2gwServiceProvider: ['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default'] + + # Optional + # L2gwServiceDefaultInterfaceName: "FortyGigE1/0/1" + # L2gwServiceDefaultDeviceName: "Switch1" + # L2gwServiceQuotaL2Gateway: 10 + # L2gwServicePeriodicMonitoringInterval: 5 + # L2gwAgentOvsdbHosts: ["ovsdb1:127.0.0.1:6632"] + # L2gwAgentEnableManager: False + # L2gwAgentManagerTableListeningPort: "6633" + # L2gwAgentPeriodicInterval: 20 + # L2gwAgentMaxConnectionRetries: 10 + # L2gwAgentSocketTimeout: 30 -- cgit 1.2.3-korg