Merge "Remove implementation for Nuage integration"

openstack-archive · Jun 7, 2022 · e30c94f · e30c94f
2 parents ba521cf + eae3c25
commit e30c94f
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 349 deletions.
diff --git a/ci/environments/scenario000-standalone.yaml b/ci/environments/scenario000-standalone.yaml
@@ -35,7 +35,6 @@ resource_registry:
   OS::TripleO::Services::ComputeCeilometerAgent: OS::Heat::None
   OS::TripleO::Services::ComputeInstanceHA: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
-  OS::TripleO::Services::ComputeNeutronCorePluginNuage: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
@@ -105,7 +104,6 @@ resource_registry:
   OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None
   OS::TripleO::Services::NeutronCorePlugin: OS::Heat::None
   OS::TripleO::Services::NeutronCorePluginML2Ansible: OS::Heat::None
-  OS::TripleO::Services::NeutronCorePluginML2Nuage: OS::Heat::None
   OS::TripleO::Services::NeutronCorePluginML2OVN: OS::Heat::None
   OS::TripleO::Services::NeutronCorePluginMLNXSDN: OS::Heat::None
   OS::TripleO::Services::NeutronCorePluginNSX: OS::Heat::None
@@ -118,7 +116,6 @@ resource_registry:
   OS::TripleO::Services::NeutronLbaasv2Api: OS::Heat::None
   OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None
   OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
-  OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::NeutronSfcApi: OS::Heat::None
   OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None

diff --git a/deployment/neutron/neutron-compute-plugin-nuage.yaml b/deployment/neutron/neutron-compute-plugin-nuage.yaml
diff --git a/deployment/neutron/neutron-controller-plugin-nuage.yaml b/deployment/neutron/neutron-controller-plugin-nuage.yaml
diff --git a/deployment/neutron/neutron-plugin-ml2-nuage.yaml b/deployment/neutron/neutron-plugin-ml2-nuage.yaml
diff --git a/environments/disable-neutron.yaml b/environments/disable-neutron.yaml
@@ -1,5 +1,4 @@
 resource_registry:
-  OS::TripleO::Services::ComputeNeutronCorePluginNuage: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::ComputeNeutronOvsDpdk: OS::Heat::None
@@ -8,7 +7,6 @@ resource_registry:
   OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
   OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None
   OS::TripleO::Services::NeutronCorePluginML2Ansible: OS::Heat::None
-  OS::TripleO::Services::NeutronCorePluginML2Nuage: OS::Heat::None
   OS::TripleO::Services::NeutronCorePluginML2OVN: OS::Heat::None
   OS::TripleO::Services::NeutronCorePluginMLNXSDN: OS::Heat::None
   OS::TripleO::Services::NeutronCorePluginNSX: OS::Heat::None
@@ -22,7 +20,6 @@ resource_registry:
   OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
   OS::TripleO::Services::NeutronMl2PluginBase: OS::Heat::None
   OS::TripleO::Services::NeutronMlnxAgent: OS::Heat::None
-  OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None
   OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None
   OS::TripleO::Services::NeutronSfcApi: OS::Heat::None
   OS::TripleO::Services::NeutronSriovAgent: OS::Heat::None

diff --git a/environments/neutron-bgpvpn.yaml b/environments/neutron-bgpvpn.yaml
@@ -7,7 +7,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
-# - Nuage: BGPVPN:Nuage:nuage_neutron.bgpvpn.services.service_drivers.driver.NuageBGPVPNDriver:default
 resource_registry:
   OS::TripleO::Services::NeutronBgpVpnApi: ../deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml
 

diff --git a/environments/neutron-nuage-config.yaml b/environments/neutron-nuage-config.yaml
diff --git a/environments/nova-nuage-config.yaml b/environments/nova-nuage-config.yaml