Merge "Add BGPVPN services to scenario004"
This commit is contained in:
commit
84690023cb
|
@ -76,6 +76,8 @@ and should be executed according to the following table:
|
|||
+----------------+-------------+-------------+-------------+-------------+-----------------+
|
||||
| neutron | ovs | ovs | ovs | ovs | X |
|
||||
+----------------+-------------+-------------+-------------+-------------+-----------------+
|
||||
| neutron-bgpvpn | | | | X | |
|
||||
+----------------+-------------+-------------+-------------+-------------+-----------------+
|
||||
| rabbitmq | X | X | X | X | X |
|
||||
+----------------+-------------+-------------+-------------+-------------+-----------------+
|
||||
| mongodb | X | X | | | |
|
||||
|
|
|
@ -12,6 +12,7 @@ resource_registry:
|
|||
OS::TripleO::Services::ManilaScheduler: ../../puppet/services/manila-scheduler.yaml
|
||||
OS::TripleO::Services::ManilaShare: ../../puppet/services/pacemaker/manila-share.yaml
|
||||
OS::TripleO::Services::ManilaBackendCephFs: ../../puppet/services/manila-backend-cephfs.yaml
|
||||
OS::TripleO::Services::NeutronBgpVpnApi: ../../puppet/services/neutron-bgpvpn-api.yaml
|
||||
# These enable Pacemaker
|
||||
OS::TripleO::Tasks::ControllerPrePuppet: ../../extraconfig/tasks/pre_puppet_pacemaker.yaml
|
||||
OS::TripleO::Tasks::ControllerPostPuppet: ../../extraconfig/tasks/post_puppet_pacemaker.yaml
|
||||
|
@ -39,6 +40,7 @@ parameter_defaults:
|
|||
- OS::TripleO::Services::HeatEngine
|
||||
- OS::TripleO::Services::MySQL
|
||||
- OS::TripleO::Services::MySQLClient
|
||||
- OS::TripleO::Services::NeutronBgpVpnApi
|
||||
- OS::TripleO::Services::NeutronDhcpAgent
|
||||
- OS::TripleO::Services::NeutronL3Agent
|
||||
- OS::TripleO::Services::NeutronMetadataAgent
|
||||
|
@ -83,3 +85,5 @@ parameter_defaults:
|
|||
CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
|
||||
CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
|
||||
SwiftCeilometerPipelineEnabled: false
|
||||
NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin'
|
||||
BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default'
|
||||
|
|
|
@ -12,5 +12,5 @@ resource_registry:
|
|||
OS::TripleO::Services::NeutronBgpVpnApi: ../puppet/services/neutron-bgpvpn-api.yaml
|
||||
|
||||
parameter_defaults:
|
||||
NeutronServicePlugins: 'networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin'
|
||||
NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin'
|
||||
BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default'
|
||||
|
|
Loading…
Reference in New Issue