openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "OpendaylightApiNetwork is no longer used"

This commit is contained in:
Zuul 2022-11-30 00:55:52 +00:00 committed by Gerrit Code Review
parent 59300dfb30 d98eaa115f
commit afbc1dfc6c
3 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
environments/neutron-bgpvpn.yaml
View File

@ -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

1
environments/neutron-l2gw.yaml
View File

@ -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

1
overcloud-resource-registry-puppet.j2.yaml
View File

@ -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') }}