openstack/tripleo-heat-templates
Code Issues Proposed changes

Add Neutron L2 Gateway service to scenario 004

Browse Source 
This submission installs the Neutron L2 Gateway service
in the scenario 004.

This is only to check that the service is installed correctly
no sanity check is running yet.

Change-Id: I421802e9aa1a9f192860a6d72b4bb7c729666c3a
This commit is contained in:
Carlos Camacho
2017-05-12 09:59:48 +02:00
parent 0900c88428
commit 3c211523c8
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@@ -78,6 +78,8 @@ and should be executed according to the following table:
+----------------+-------------+-------------+-------------+-------------+-----------------+ +----------------+-------------+-------------+-------------+-------------+-----------------+
| neutron-bgpvpn | | | | X | | | neutron-bgpvpn | | | | X | |
+----------------+-------------+-------------+-------------+-------------+-----------------+ +----------------+-------------+-------------+-------------+-------------+-----------------+
| neutron-l2gw | | | | X | |
+----------------+-------------+-------------+-------------+-------------+-----------------+
| rabbitmq | X | X | X | X | X | | rabbitmq | X | X | X | X | X |
+----------------+-------------+-------------+-------------+-------------+-----------------+ +----------------+-------------+-------------+-------------+-------------+-----------------+
| mongodb | X | X | | | | | mongodb | X | X | | | |

7
ci/environments/scenario004-multinode.yaml
View File

@@ -13,6 +13,8 @@ resource_registry:
OS::TripleO::Services::ManilaShare: ../../puppet/services/pacemaker/manila-share.yaml OS::TripleO::Services::ManilaShare: ../../puppet/services/pacemaker/manila-share.yaml
OS::TripleO::Services::ManilaBackendCephFs: ../../puppet/services/manila-backend-cephfs.yaml OS::TripleO::Services::ManilaBackendCephFs: ../../puppet/services/manila-backend-cephfs.yaml
OS::TripleO::Services::NeutronBgpVpnApi: ../../puppet/services/neutron-bgpvpn-api.yaml OS::TripleO::Services::NeutronBgpVpnApi: ../../puppet/services/neutron-bgpvpn-api.yaml
OS::TripleO::Services::NeutronL2gwApi: ../../puppet/services/neutron-l2gw-api.yaml
OS::TripleO::Services::NeutronL2gwAgent: ../../puppet/services/neutron-l2gw-agent.yaml
# These enable Pacemaker # These enable Pacemaker
OS::TripleO::Tasks::ControllerPreConfig: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml OS::TripleO::Tasks::ControllerPreConfig: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml
OS::TripleO::Tasks::ControllerPostConfig: ../../extraconfig/tasks/post_puppet_pacemaker.yaml OS::TripleO::Tasks::ControllerPostConfig: ../../extraconfig/tasks/post_puppet_pacemaker.yaml
@@ -44,6 +46,8 @@ parameter_defaults:
- OS::TripleO::Services::NeutronBgpVpnApi - OS::TripleO::Services::NeutronBgpVpnApi
- OS::TripleO::Services::NeutronDhcpAgent - OS::TripleO::Services::NeutronDhcpAgent
- OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronL3Agent
- OS::TripleO::Services::NeutronL2gwApi
- OS::TripleO::Services::NeutronL2gwAgent
- OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::NeutronServer - OS::TripleO::Services::NeutronServer
- OS::TripleO::Services::NeutronCorePlugin - OS::TripleO::Services::NeutronCorePlugin
@@ -87,5 +91,6 @@ parameter_defaults:
CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
SwiftCeilometerPipelineEnabled: false SwiftCeilometerPipelineEnabled: false
NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin' NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin, networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin'
BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default' BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default'
L2gwServiceProvider: ['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default']