Merge "Remove support for Nuage core plugin"

ci/environments/scenario000-standalone.yaml

@@ -108,7 +108,6 @@ resource_registry:
   OS::TripleO::Services::NeutronCorePluginML2OVN: OS::Heat::None
   OS::TripleO::Services::NeutronCorePluginMLNXSDN: OS::Heat::None
   OS::TripleO::Services::NeutronCorePluginNSX: OS::Heat::None
-  OS::TripleO::Services::NeutronCorePluginNuage: OS::Heat::None
   OS::TripleO::Services::NeutronCorePluginVTS: OS::Heat::None
   OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None
   OS::TripleO::Services::NeutronL2gwAgent: OS::Heat::None

deployment/neutron/neutron-plugin-nuage.yaml

@@ -1,96 +0,0 @@
-heat_template_version: wallaby
-
-description: >
-  OpenStack Neutron Nuage plugin
-
-parameters:
-  ServiceData:
-    default: {}
-    description: Dictionary packing service data
-    type: json
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry. Use
-                 parameter_merge_strategies to merge it with the defaults.
-    type: json
-  RoleName:
-    default: ''
-    description: Role name on which the service is applied
-    type: string
-  RoleParameters:
-    default: {}
-    description: Parameters specific to the role
-    type: json
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  # Config specific parameters, to be provided via parameter_defaults
-  NeutronNuageNetPartitionName:
-    description: Specifies the title that you will see on the VSD
-    type: string
-    default: 'default_name'
-
-  NeutronNuageVSDIp:
-    description: IP address and port of the Virtual Services Directory
-    type: string
-
-  NeutronNuageVSDUsername:
-    description: Username to be used to log into VSD
-    type: string
-
-  NeutronNuageVSDPassword:
-    description: Password to be used to log into VSD
-    type: string
-
-  NeutronNuageVSDOrganization:
-    description: Organization parameter required to log into VSD
-    type: string
-    default: 'organization'
-
-  NeutronNuageBaseURIVersion:
-    description: URI version to be used based on the VSD release
-    type: string
-    default: 'default_uri_version'
-
-  NeutronNuageCMSId:
-    description: Cloud Management System ID (CMS ID) to distinguish between OS instances on the same VSD
-    type: string
-
-  UseForwardedFor:
-    description: Treat X-Forwarded-For as the canonical remote address. Only enable this if you have a sanitizing proxy.
-    type: boolean
-    default: false
-
-resources:
-  NeutronBase:
-    type: ./neutron-base.yaml
-    properties:
-      ServiceData: {get_param: ServiceData}
-      ServiceNetMap: {get_param: ServiceNetMap}
-      EndpointMap: {get_param: EndpointMap}
-      RoleName: {get_param: RoleName}
-      RoleParameters: {get_param: RoleParameters}
-
-outputs:
-  role_data:
-    description: Role data for the Neutron Nuage plugin
-    value:
-      service_name: neutron_plugin_nuage
-      config_settings:
-        map_merge:
-          - get_attr: [NeutronBase, role_data, config_settings]
-          - neutron::plugins::nuage::nuage_net_partition_name: {get_param: NeutronNuageNetPartitionName}
-            neutron::plugins::nuage::nuage_vsd_ip: {get_param: NeutronNuageVSDIp}
-            neutron::plugins::nuage::nuage_vsd_username: {get_param: NeutronNuageVSDUsername}
-            neutron::plugins::nuage::nuage_vsd_password: {get_param: NeutronNuageVSDPassword}
-            neutron::plugins::nuage::nuage_vsd_organization: {get_param: NeutronNuageVSDOrganization}
-            neutron::plugins::nuage::nuage_base_uri_version: {get_param: NeutronNuageBaseURIVersion}
-            neutron::plugins::nuage::nuage_cms_id: {get_param: NeutronNuageCMSId}
-            nova::api::use_forwarded_for: {get_param: UseForwardedFor}
-      step_config: |
-        include tripleo::profile::base::neutron::plugins::nuage
-      metadata_settings:
-        get_attr: [NeutronBase, role_data, metadata_settings]

environments/disable-neutron.yaml

@@ -12,7 +12,6 @@ resource_registry:
   OS::TripleO::Services::NeutronCorePluginML2OVN: OS::Heat::None
   OS::TripleO::Services::NeutronCorePluginMLNXSDN: OS::Heat::None
   OS::TripleO::Services::NeutronCorePluginNSX: OS::Heat::None
-  OS::TripleO::Services::NeutronCorePluginNuage: OS::Heat::None
   OS::TripleO::Services::NeutronCorePlugin: OS::Heat::None
   OS::TripleO::Services::NeutronCorePluginVTS: OS::Heat::None
   OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None

overcloud-resource-registry-puppet.j2.yaml

@@ -153,7 +153,6 @@ resource_registry:
   OS::TripleO::Services::ComputeNeutronCorePluginNuage: deployment/neutron/neutron-compute-plugin-nuage.yaml
   # Neutron Core Plugin Vendors (these typically override NeutronCorePlugin)
   OS::TripleO::Services::NeutronCorePluginML2OVN: deployment/neutron/neutron-plugin-ml2-ovn.yaml
-  OS::TripleO::Services::NeutronCorePluginNuage: deployment/neutron/neutron-plugin-nuage.yaml
   OS::TripleO::Services::NeutronCorePluginML2Nuage: deployment/neutron/neutron-plugin-ml2-nuage.yaml
   OS::TripleO::Services::NeutronCorePluginNSX: deployment/neutron/neutron-plugin-nsx-container-puppet.yaml
   OS::TripleO::Services::OVNDBs: deployment/ovn/ovn-dbs-pacemaker-puppet.yaml