Merge "OpendaylightApiNetwork is no longer used"
This commit is contained in:
commit
afbc1dfc6c
@ -6,7 +6,6 @@
|
||||
#
|
||||
# - Bagpipe: BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe.BaGPipeBGPVPNDriver:default
|
||||
# - OpenContrail: BGPVPN:OpenContrail:networking_bgpvpn.neutron.services.service_drivers.opencontrail.opencontrail.OpenContrailBGPVPNDriver:default
|
||||
# - OpenDaylight: BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default
|
||||
resource_registry:
|
||||
OS::TripleO::Services::NeutronBgpVpnApi: ../deployment/deprecated/neutron/neutron-bgpvpn-api-container-puppet.yaml
|
||||
|
||||
|
@ -5,7 +5,6 @@
|
||||
# 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_v2.OpenDaylightL2gwDriver:default
|
||||
resource_registry:
|
||||
OS::TripleO::Services::NeutronL2gwApi: ../deployment/deprecated/neutron/neutron-l2gw-api-container-puppet.yaml
|
||||
OS::TripleO::Services::NeutronL2gwAgent: ../deployment/depecated/neutron/neutron-l2gw-agent-baremetal-puppet.yaml
|
||||
|
@ -393,7 +393,6 @@ parameter_defaults:
|
||||
CephRgwNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
|
||||
PublicNetwork: {{ _service_nets.get('external', 'ctlplane') }}
|
||||
InternalApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||
OpendaylightApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||
OvnDbsNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||
DockerRegistryNetwork: ctlplane
|
||||
PacemakerNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||
|
Loading…
Reference in New Issue
Block a user