From 8213618f3386ba604e22d37f11e8c88401458359 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 6 May 2020 20:55:31 +0900 Subject: [PATCH] Remove support for Neutron FUJITSU plugin It seems that netwokring-fujitsu is no longer maintained[1], and it's not compatible with Python 3.6 which currently all OpenStack services require. [1] https://opendev.org/x/networking-fujitsu Change-Id: Iae639864cce8e3add635944f157ecde074312e74 --- ci/environments/scenario000-standalone.yaml | 2 - .../neutron-plugin-ml2-fujitsu-cfab.yaml | 90 ------------------ .../neutron-plugin-ml2-fujitsu-fossw.yaml | 94 ------------------- environments/neutron-ml2-fujitsu-cfab.yaml | 21 ----- environments/neutron-ml2-fujitsu-fossw.yaml | 22 ----- .../undercloud/undercloud-minion.yaml | 2 - overcloud-resource-registry-puppet.j2.yaml | 2 - ...tron-fujitsu-plugins-6414a5d6962e3260.yaml | 4 + roles/Controller.yaml | 2 - roles/ControllerNoCeph.yaml | 2 - roles/ControllerNovaStandalone.yaml | 2 - roles/ControllerSriov.yaml | 2 - roles/ControllerStorageDashboard.yaml | 2 - roles/ControllerStorageNfs.yaml | 2 - roles/Networker.yaml | 2 - roles/NetworkerSriov.yaml | 2 - roles/Standalone.yaml | 2 - roles_data.yaml | 2 - sample-env-generator/undercloud-minion.yaml | 2 - 19 files changed, 4 insertions(+), 255 deletions(-) delete mode 100644 deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml delete mode 100644 deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml delete mode 100644 environments/neutron-ml2-fujitsu-cfab.yaml delete mode 100644 environments/neutron-ml2-fujitsu-fossw.yaml create mode 100644 releasenotes/notes/remove-neutron-fujitsu-plugins-6414a5d6962e3260.yaml diff --git a/ci/environments/scenario000-standalone.yaml b/ci/environments/scenario000-standalone.yaml index 5f952de08d..ee7a905805 100644 --- a/ci/environments/scenario000-standalone.yaml +++ b/ci/environments/scenario000-standalone.yaml @@ -125,8 +125,6 @@ resource_registry: OS::TripleO::Services::NeutronLbaasv2Agent: OS::Heat::None OS::TripleO::Services::NeutronLbaasv2Api: OS::Heat::None OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None - OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None - OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None diff --git a/deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml b/deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml deleted file mode 100644 index 96fd3923f5..0000000000 --- a/deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml +++ /dev/null @@ -1,90 +0,0 @@ -heat_template_version: rocky - -description: > - Configure hieradata for Fujitsu C-Fabric plugin configuration - -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. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - 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 - NeutronFujitsuCfabAddress: - description: 'The address of the C-Fabric to telnet to.' - type: string - NeutronFujitsuCfabUserName: - description: 'The C-Fabric username to use.' - type: string - NeutronFujitsuCfabPassword: - description: 'The C-Fabric password to use.' - type: string - hidden: true - NeutronFujitsuCfabPhysicalNetworks: - description: 'List of : tuples specifying physical_network names and corresponding vfab ids.' - type: comma_delimited_list - default: '' - NeutronFujitsuCfabSharePprofile: - description: '"Whether to share a C-Fabric pprofile among Neutron ports using the same VLAN ID.' - type: boolean - default: false - NeutronFujitsuCfabPprofilePrefix: - description: 'The prefix string for pprofile name.' - type: string - default: '' - NeutronFujitsuCfabSaveConfig: - description: 'Whether to save configuration.' - type: boolean - default: true - -resources: - - NeutronMl2Base: - type: ./neutron-plugin-ml2.yaml - properties: - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} - EndpointMap: {get_param: EndpointMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - -outputs: - role_data: - description: Role data for Fujitsu Cfab ML2 Driver - value: - service_name: neutron_plugin_ml2_fujitsu_cfab - config_settings: - map_merge: - - get_attr: [NeutronMl2Base, role_data, config_settings] - - neutron::plugins::ml2::fujitsu::cfab::address: {get_param: NeutronFujitsuCfabAddress} - neutron::plugins::ml2::fujitsu::cfab::username: {get_param: NeutronFujitsuCfabUserName} - neutron::plugins::ml2::fujitsu::cfab::password: {get_param: NeutronFujitsuCfabPassword} - neutron::plugins::ml2::fujitsu::cfab::physical_networks: {get_param: NeutronFujitsuCfabPhysicalNetworks} - neutron::plugins::ml2::fujitsu::cfab::share_pprofile: {get_param: NeutronFujitsuCfabSharePprofile} - neutron::plugins::ml2::fujitsu::cfab::pprofile_prefix: {get_param: NeutronFujitsuCfabPprofilePrefix} - neutron::plugins::ml2::fujitsu::cfab::save_config: {get_param: NeutronFujitsuCfabSaveConfig} - step_config: | - include tripleo::profile::base::neutron::plugins::ml2 - metadata_settings: - get_attr: [NeutronMl2Base, role_data, metadata_settings] diff --git a/deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml b/deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml deleted file mode 100644 index 988eb2312b..0000000000 --- a/deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml +++ /dev/null @@ -1,94 +0,0 @@ -heat_template_version: rocky - -description: Configure hieradata for Fujitsu fossw plugin configuration - -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. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - 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 - NeutronFujitsuFosswIps: - description: 'The List of IP address of all fos switches.' - type: comma_delimited_list - NeutronFujitsuFosswUserName: - description: 'The username of the fos switches.' - type: string - NeutronFujitsuFosswPassword: - description: 'The password of the fos switches.' - type: string - hidden: true - NeutronFujitsuFosswPort: - description: 'The port number used for SSH connection.' - type: number - default: 22 - NeutronFujitsuFosswTimeout: - description: 'The timeout os SSH connection.' - type: number - default: 30 - NeutronFujitsuFosswUdpDestPort: - description: 'The port number of VXLAN UDP destination on the fos switches.' - type: number - default: 4789 - NeutronFujitsuFosswOvsdbVlanidRangeMin: - description: 'The minimum VLAN ID in the range that is used for binding VNI and physical port.' - type: number - default: 2 - NeutronFujitsuFosswOvsdbPort: - description: 'The port number which OVSDB server on the fos switches listen.' - type: number - default: 6640 - -resources: - - NeutronMl2Base: - type: ./neutron-plugin-ml2.yaml - properties: - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} - EndpointMap: {get_param: EndpointMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - -outputs: - role_data: - description: Role data for Fujitsu Fossw ML2 Driver - value: - service_name: neutron_plugin_ml2_fujitsu_fossw - config_settings: - map_merge: - - get_attr: [NeutronMl2Base, role_data, config_settings] - - neutron::plugins::ml2::fujitsu::fossw::fossw_ips: {get_param: NeutronFujitsuFosswIps} - neutron::plugins::ml2::fujitsu::fossw::username: {get_param: NeutronFujitsuFosswUserName} - neutron::plugins::ml2::fujitsu::fossw::password: {get_param: NeutronFujitsuFosswPassword} - neutron::plugins::ml2::fujitsu::fossw::port: {get_param: NeutronFujitsuFosswPort} - neutron::plugins::ml2::fujitsu::fossw::timeout: {get_param: NeutronFujitsuFosswTimeout} - neutron::plugins::ml2::fujitsu::fossw::udp_dest_port: {get_param: NeutronFujitsuFosswUdpDestPort} - neutron::plugins::ml2::fujitsu::fossw::ovsdb_vlanid_range_min: {get_param: NeutronFujitsuFosswOvsdbVlanidRangeMin} - neutron::plugins::ml2::fujitsu::fossw::ovsdb_port: {get_param: NeutronFujitsuFosswOvsdbPort} - step_config: | - include tripleo::profile::base::neutron::plugins::ml2 - metadata_settings: - get_attr: [NeutronMl2Base, role_data, metadata_settings] diff --git a/environments/neutron-ml2-fujitsu-cfab.yaml b/environments/neutron-ml2-fujitsu-cfab.yaml deleted file mode 100644 index 7777cf60ba..0000000000 --- a/environments/neutron-ml2-fujitsu-cfab.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# A Heat environment file which can be used to enable Fujitsu C-Fabric -# plugin, configured via puppet -resource_registry: - OS::TripleO::Services::NeutronML2FujitsuCfab: ../deployment/neutron/neutron-plugin-ml2-fujitsu-cfab.yaml - -parameter_defaults: - # Fixed - NeutronMechanismDrivers: ['openvswitch','fujitsu_cfab'] - NeutronTypeDrivers: 'vlan' - NeutronNetworkType: 'vlan' - - # Required - NeutronFujitsuCfabAddress: '192.168.0.1' - NeutronFujitsuCfabUserName: 'admin' - NeutronFujitsuCfabPassword: - - # Optional - #NeutronFujitsuCfabPhysicalNetworks: - #NeutronFujitsuCfabSharePprofile: - #NeutronFujitsuCfabPprofilePrefix: - #NeutronFujitsuCfabSaveConfig: diff --git a/environments/neutron-ml2-fujitsu-fossw.yaml b/environments/neutron-ml2-fujitsu-fossw.yaml deleted file mode 100644 index 8ce4a58ffd..0000000000 --- a/environments/neutron-ml2-fujitsu-fossw.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# A Heat environment file which can be used to enable Fujitsu fossw -# plugin, configured via puppet -resource_registry: - OS::TripleO::Services::NeutronML2FujitsuFossw: ../deployment/neutron/neutron-plugin-ml2-fujitsu-fossw.yaml - -parameter_defaults: - # Fixed - NeutronMechanismDrivers: ['openvswitch','fujitsu_fossw'] - NeutronTypeDrivers: ['vlan','vxlan'] - NeutronNetworkType: ['vlan','vxlan'] - - # Required - NeutronFujitsuFosswIps: '192.168.0.1,192.168.0.2' - NeutronFujitsuFosswUserName: - NeutronFujitsuFosswPassword: - - # Optional - #NeutronFujitsuFosswPort: - #NeutronFujitsuFosswTimeout: - #NeutronFujitsuFosswUdpDestPort: - #NeutronFujitsuFosswOvsdbVlanidRangeMin: - #NeutronFujitsuFosswOvsdbPort: diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml index 9e68931046..dea57f499b 100644 --- a/environments/undercloud/undercloud-minion.yaml +++ b/environments/undercloud/undercloud-minion.yaml @@ -154,8 +154,6 @@ resource_registry: OS::TripleO::Services::NeutronLbaasv2Agent: OS::Heat::None OS::TripleO::Services::NeutronLbaasv2Api: OS::Heat::None OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None - OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None - OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index dae8e6236f..e87738fad0 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -270,8 +270,6 @@ resource_registry: OS::TripleO::Services::OpenStackClients: OS::Heat::None OS::TripleO::Services::TLSProxyBase: OS::Heat::None OS::TripleO::Services::Zaqar: OS::Heat::None - OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None - OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None OS::TripleO::Services::CinderBackendDellSc: OS::Heat::None OS::TripleO::Services::CinderBackendDellEMCSc: OS::Heat::None OS::TripleO::Services::CinderBackendDellEMCPowermax: OS::Heat::None diff --git a/releasenotes/notes/remove-neutron-fujitsu-plugins-6414a5d6962e3260.yaml b/releasenotes/notes/remove-neutron-fujitsu-plugins-6414a5d6962e3260.yaml new file mode 100644 index 0000000000..21c3dc0fd5 --- /dev/null +++ b/releasenotes/notes/remove-neutron-fujitsu-plugins-6414a5d6962e3260.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - | + Support for Neutron FUJITSU plugin has been removed. diff --git a/roles/Controller.yaml b/roles/Controller.yaml index c37cf9b46a..9fe4af5517 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -134,8 +134,6 @@ - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - - OS::TripleO::Services::NeutronML2FujitsuCfab - - OS::TripleO::Services::NeutronML2FujitsuFossw - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronAgentsIBConfig diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index dbc6719fbb..10d7c31c6b 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -126,8 +126,6 @@ - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - - OS::TripleO::Services::NeutronML2FujitsuCfab - - OS::TripleO::Services::NeutronML2FujitsuFossw - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronAgentsIBConfig diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 64ada39099..fa6cb22e85 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -110,8 +110,6 @@ - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - - OS::TripleO::Services::NeutronML2FujitsuCfab - - OS::TripleO::Services::NeutronML2FujitsuFossw - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NovaIronic diff --git a/roles/ControllerSriov.yaml b/roles/ControllerSriov.yaml index 892bcee28d..819858d6bc 100644 --- a/roles/ControllerSriov.yaml +++ b/roles/ControllerSriov.yaml @@ -134,8 +134,6 @@ - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - - OS::TripleO::Services::NeutronML2FujitsuCfab - - OS::TripleO::Services::NeutronML2FujitsuFossw - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronAgentsIBConfig diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index bb309ade87..3ae2129ed7 100644 --- a/roles/ControllerStorageDashboard.yaml +++ b/roles/ControllerStorageDashboard.yaml @@ -135,8 +135,6 @@ - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - - OS::TripleO::Services::NeutronML2FujitsuCfab - - OS::TripleO::Services::NeutronML2FujitsuFossw - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronAgentsIBConfig diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 67fcabcc85..911134975e 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -136,8 +136,6 @@ - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - - OS::TripleO::Services::NeutronML2FujitsuCfab - - OS::TripleO::Services::NeutronML2FujitsuFossw - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronAgentsIBConfig diff --git a/roles/Networker.yaml b/roles/Networker.yaml index b5a5be2e8a..35791c807e 100644 --- a/roles/Networker.yaml +++ b/roles/Networker.yaml @@ -31,8 +31,6 @@ - OS::TripleO::Services::NeutronL2gwAgent - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronMetadataAgent - - OS::TripleO::Services::NeutronML2FujitsuCfab - - OS::TripleO::Services::NeutronML2FujitsuFossw - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::ContainersLogrotateCrond diff --git a/roles/NetworkerSriov.yaml b/roles/NetworkerSriov.yaml index 5232eb20e7..5082fb1509 100644 --- a/roles/NetworkerSriov.yaml +++ b/roles/NetworkerSriov.yaml @@ -32,8 +32,6 @@ - OS::TripleO::Services::NeutronL2gwAgent - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronMetadataAgent - - OS::TripleO::Services::NeutronML2FujitsuCfab - - OS::TripleO::Services::NeutronML2FujitsuFossw - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::ContainersLogrotateCrond diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index 01bb1fa98a..c29aec222a 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -129,8 +129,6 @@ - OS::TripleO::Services::NeutronL2gwApi - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLinuxbridgeAgent - - OS::TripleO::Services::NeutronML2FujitsuCfab - - OS::TripleO::Services::NeutronML2FujitsuFossw - OS::TripleO::Services::NeutronMetadataAgent - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronSfcApi diff --git a/roles_data.yaml b/roles_data.yaml index 9bd5999f18..530799f91e 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -137,8 +137,6 @@ - OS::TripleO::Services::NeutronL3Agent - OS::TripleO::Services::NeutronLinuxbridgeAgent - OS::TripleO::Services::NeutronMetadataAgent - - OS::TripleO::Services::NeutronML2FujitsuCfab - - OS::TripleO::Services::NeutronML2FujitsuFossw - OS::TripleO::Services::NeutronOvsAgent - OS::TripleO::Services::NeutronVppAgent - OS::TripleO::Services::NeutronAgentsIBConfig diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml index 356deba4b3..af9863828d 100644 --- a/sample-env-generator/undercloud-minion.yaml +++ b/sample-env-generator/undercloud-minion.yaml @@ -175,8 +175,6 @@ environments: OS::TripleO::Services::NeutronLbaasv2Api: OS::Heat::None OS::TripleO::Services::NeutronLinuxbridgeAgent: OS::Heat::None OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None - OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None - OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None OS::TripleO::Services::NeutronNuageVrs: OS::Heat::None OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None OS::TripleO::Services::NeutronSfcApi: OS::Heat::None