From 336e9d39a92107d2a69224ba28b619fdfcaea0b7 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 3 Apr 2020 08:23:06 +0900 Subject: [PATCH] Remove Dell EMC PS Series Driver support ... because it it not supported in anymore, and puppet-cinder implementation was already removed in [1] [1] 7083e88a699233930b0de413394ae95cab649462 Depends-on: https://review.opendev.org/#/c/716027/ Depends-on: https://review.opendev.org/#/c/717144/ Change-Id: I8b7af40a4dfba297821a7aae6edf5938c43034a1 --- .../cinder/cinder-backend-dellps-puppet.yaml | 111 ------------------ environments/cinder-dellps-config.yaml | 32 ----- overcloud-resource-registry-puppet.j2.yaml | 1 - ...inder-remove-dell-ps-fce96d05f529d0da.yaml | 5 + roles/Controller.yaml | 1 - roles/ControllerNoCeph.yaml | 1 - roles/ControllerNovaStandalone.yaml | 1 - roles/ControllerStorageDashboard.yaml | 1 - roles/ControllerStorageNfs.yaml | 1 - roles/Standalone.yaml | 1 - roles_data.yaml | 1 - 11 files changed, 5 insertions(+), 151 deletions(-) delete mode 100644 deployment/cinder/cinder-backend-dellps-puppet.yaml delete mode 100644 environments/cinder-dellps-config.yaml create mode 100644 releasenotes/notes/cinder-remove-dell-ps-fce96d05f529d0da.yaml diff --git a/deployment/cinder/cinder-backend-dellps-puppet.yaml b/deployment/cinder/cinder-backend-dellps-puppet.yaml deleted file mode 100644 index 92d7a29ae9..0000000000 --- a/deployment/cinder/cinder-backend-dellps-puppet.yaml +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright (c) 2017 Dell Inc. or its subsidiaries. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -heat_template_version: rocky - -description: > - Openstack Cinder Dell EMC PS Series backend - -parameters: - CinderEnableDellPsBackend: - type: boolean - default: true - CinderDellPsBackendName: - type: string - default: 'tripleo_dellps' - CinderDellPsAvailabilityZone: - default: '' - description: > - The availability zone of the Dell PS Cinder backend. - When set, it overrides the default CinderStorageAvailabilityZone. - type: string - CinderDellPsSanIp: - type: string - CinderDellPsSanLogin: - type: string - CinderDellPsSanPassword: - type: string - hidden: true - CinderDellPsSanPrivateKey: - type: string - default: '' - CinderDellPsSanThinProvision: - type: boolean - default: true - CinderDellPsGroupname: - type: string - default: 'group-0' - CinderDellPsPool: - type: string - default: 'default' - CinderDellPsChapLogin: - type: string - default: '' - CinderDellPsChapPassword: - type: string - default: '' - CinderDellPsUseChap: - type: boolean - default: false - 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: {} - type: json - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - -outputs: - role_data: - description: Role data for the Cinder Dell EMC PS Series backend. - value: - service_name: cinder_backend_dellps - config_settings: - map_merge: - - tripleo::profile::base::cinder::volume::cinder_enable_dellps_backend: {get_param: CinderEnableDellPsBackend} - cinder::backend::eqlx::volume_backend_name: {get_param: CinderDellPsBackendName} - cinder::backend::eqlx::san_ip: {get_param: CinderDellPsSanIp} - cinder::backend::eqlx::san_login: {get_param: CinderDellPsSanLogin} - cinder::backend::eqlx::san_password: {get_param: CinderDellPsSanPassword} - cinder::backend::eqlx::san_private_key: {get_param: CinderDellPsSanPrivateKey} - cinder::backend::eqlx::san_thin_provision: {get_param: CinderDellPsSanThinProvision} - cinder::backend::eqlx::eqlx_group_name: {get_param: CinderDellPsGroupname} - cinder::backend::eqlx::eqlx_pool: {get_param: CinderDellPsPool} - cinder::backend::eqlx::eqlx_use_chap: {get_param: CinderDellPsUseChap} - cinder::backend::eqlx::eqlx_chap_login: {get_param: CinderDellPsChapLogin} - cinder::backend::eqlx::eqlx_chap_password: {get_param: CinderDellPsChapPassword} - - - if: - - {equals : [{get_param: CinderDellPsAvailabilityZone}, '']} - - {} - - cinder::backend::eqlx::backend_availability_zone: {get_param: CinderDellPsAvailabilityZone} diff --git a/environments/cinder-dellps-config.yaml b/environments/cinder-dellps-config.yaml deleted file mode 100644 index 8a28730a8b..0000000000 --- a/environments/cinder-dellps-config.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2016-2017 Dell Inc, or its subsidiaries. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# A Heat environment file which can be used to enable a -# a Cinder Dell EMC PS Series backend, configured via puppet -resource_registry: - OS::TripleO::Services::CinderBackendDellPs: ../deployment/cinder/cinder-backend-dellps-puppet.yaml - -parameter_defaults: - CinderEnableDellPsBackend: true - CinderDellPsBackendName: 'tripleo_dellps' - CinderDellPsSanIp: '' - CinderDellPsSanLogin: '' - CinderDellPsSanPassword: '' - CinderDellPsSanPrivateKey: '' - CinderDellPsSanThinProvision: true - CinderDellPsGroupname: 'group-0' - CinderDellPsPool: 'default' - CinderDellPsChapLogin: '' - CinderDellPsChapPassword: '' - CinderDellPsUseChap: false diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index bd4253c633..499f3aa092 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -272,7 +272,6 @@ resource_registry: OS::TripleO::Services::Zaqar: OS::Heat::None OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None OS::TripleO::Services::NeutronML2FujitsuFossw: OS::Heat::None - OS::TripleO::Services::CinderBackendDellPs: OS::Heat::None OS::TripleO::Services::CinderBackendDellSc: OS::Heat::None OS::TripleO::Services::CinderBackendDellEMCUnity: OS::Heat::None OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI: OS::Heat::None diff --git a/releasenotes/notes/cinder-remove-dell-ps-fce96d05f529d0da.yaml b/releasenotes/notes/cinder-remove-dell-ps-fce96d05f529d0da.yaml new file mode 100644 index 0000000000..001e0a6b99 --- /dev/null +++ b/releasenotes/notes/cinder-remove-dell-ps-fce96d05f529d0da.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + Support for Dell EMC PS Series aka Eqlx was removed, because the driver was + deprecated in Train release and has been removed from cinder. diff --git a/roles/Controller.yaml b/roles/Controller.yaml index a2f0cee26b..f978f5e1ca 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -57,7 +57,6 @@ - OS::TripleO::Services::CephRgw - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::CinderApi - - OS::TripleO::Services::CinderBackendDellPs - OS::TripleO::Services::CinderBackendDellSc - OS::TripleO::Services::CinderBackendDellEMCUnity - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 0087a57bb1..2b7909cd3b 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -49,7 +49,6 @@ - OS::TripleO::Services::CephExternal - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::CinderApi - - OS::TripleO::Services::CinderBackendDellPs - OS::TripleO::Services::CinderBackendDellSc - OS::TripleO::Services::CinderBackendDellEMCUnity - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 1b043be27d..161d3f3580 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -42,7 +42,6 @@ - OS::TripleO::Services::CephRgw - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::CinderApi - - OS::TripleO::Services::CinderBackendDellPs - OS::TripleO::Services::CinderBackendDellSc - OS::TripleO::Services::CinderBackendDellEMCUnity - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index d3d18b7026..26c810f838 100644 --- a/roles/ControllerStorageDashboard.yaml +++ b/roles/ControllerStorageDashboard.yaml @@ -58,7 +58,6 @@ - OS::TripleO::Services::CephRgw - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::CinderApi - - OS::TripleO::Services::CinderBackendDellPs - OS::TripleO::Services::CinderBackendDellSc - OS::TripleO::Services::CinderBackendDellEMCUnity - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index eb80055a90..b3d12db85f 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -59,7 +59,6 @@ - OS::TripleO::Services::CephRgw - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::CinderApi - - OS::TripleO::Services::CinderBackendDellPs - OS::TripleO::Services::CinderBackendDellSc - OS::TripleO::Services::CinderBackendDellEMCUnity - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index e42bbb0898..3fdeed3f39 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -53,7 +53,6 @@ - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI - OS::TripleO::Services::CinderBackendDellEMCVNX - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI - - OS::TripleO::Services::CinderBackendDellPs - OS::TripleO::Services::CinderBackendDellSc - OS::TripleO::Services::CinderBackendNVMeOF - OS::TripleO::Services::CinderBackendPure diff --git a/roles_data.yaml b/roles_data.yaml index 198aa57d2c..b1aec77f5f 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -60,7 +60,6 @@ - OS::TripleO::Services::CephRgw - OS::TripleO::Services::CertmongerUser - OS::TripleO::Services::CinderApi - - OS::TripleO::Services::CinderBackendDellPs - OS::TripleO::Services::CinderBackendDellSc - OS::TripleO::Services::CinderBackendDellEMCUnity - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI