From d98eaa115fce2c82f91641acf5daf42ce67fee34 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 13 Oct 2022 14:17:47 +0900 Subject: [PATCH] OpendaylightApiNetwork is no longer used ... since OpenDaylight support was removed by [1]. This also cleans up a few remaining references in environment files. [1] 9c3638b8a13ea08a1bab95c9cd6ab335b729b6b3 Change-Id: Ic01100b74acdf9ba9490aaa8a307580f40f3e032 --- environments/neutron-bgpvpn.yaml | 1 - environments/neutron-l2gw.yaml | 1 - overcloud-resource-registry-puppet.j2.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/environments/neutron-bgpvpn.yaml b/environments/neutron-bgpvpn.yaml index dea76200a7..07af811299 100644 --- a/environments/neutron-bgpvpn.yaml +++ b/environments/neutron-bgpvpn.yaml @@ -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 diff --git a/environments/neutron-l2gw.yaml b/environments/neutron-l2gw.yaml index 21e09f07fd..17b418312e 100644 --- a/environments/neutron-l2gw.yaml +++ b/environments/neutron-l2gw.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 diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index b77e7cf8b4..8710e1c3f7 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -396,7 +396,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') }}