diff --git a/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml deleted file mode 100644 index 08af025a66..0000000000 --- a/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright (c) 2016-2018 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: wallaby - -description: > - Openstack Cinder Dell EMC XTREMIO Iscsi backend - Please note, this template is deprecated now. - Use Cinder Dell EMC Xtremio backend template defined in - cinder-backend-dellemc-xtremio--puppet.yaml. -parameters: - CinderEnableDellEMCXTREMIOIscsiBackend: - type: boolean - default: true - CinderDellEMCXTREMIOIscsiBackendName: - type: string - default: tripleo_dellemc_xtremio_iscsi - CinderDellEMCXTREMIOIscsiAvailabilityZone: - default: '' - description: > - The availability zone of the Dell EMC XtremeIO iSCSI Cinder backend. - When set, it overrides the default CinderStorageAvailabilityZone. - type: string - CinderDellEMCXTREMIOIscsiSanIp: - type: string - CinderDellEMCXTREMIOIscsiSanLogin: - type: string - default: admin - CinderDellEMCXTREMIOIscsiSanPassword: - type: string - hidden: true - CinderDellEMCXTREMIOIscsiClusterName: - type: string - CinderDellEMCXTREMIOIscsiArrayBusyRetryCount: - type: number - default: 5 - CinderDellEMCXTREMIOIscsiArrayBusyRetryInterval: - type: number - default: 5 - CinderDellEMCXTREMIOIscsiVolumesPerGlanceCache: - type: number - default: 100 - description: Number of volumes created from each cached glance image. - This is for image service optimisation. Limit the number - of copies (XtremIO snapshots) taken from each image cache. - A value of 0 ignores the limit and defers to the array - maximum as the effective limit. - CinderDellEMCXTREMIOIscsiPorts: - type: string - default: '' - description: Allowed ports. Comma separated list of XtremIO - iSCSI IPs or FC WWNs (ex. 58:cc:f0:98:49:22:07:02) - to be used. If option is not set all ports are allowed. - 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 - 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. - -parameter_groups: -- label: deprecated - description: | - The following parameters are deprecated and will be removed. - parameters: - - CinderEnableDellEMCXTREMIOIscsiBackend - - CinderDellEMCXTREMIOIscsiBackendName - - CinderDellEMCXTREMIOIscsiSanIp - - CinderDellEMCXTREMIOIscsiSanLogin - - CinderDellEMCXTREMIOIscsiSanPassword - - CinderDellEMCXTREMIOIscsiClusterName - - CinderDellEMCXTREMIOIscsiArrayBusyRetryCount - - CinderDellEMCXTREMIOIscsiArrayBusyRetryInterval - - CinderDellEMCXTREMIOIscsiVolumesPerGlanceCache - - CinderDellEMCXTREMIOIscsiPorts - -outputs: - role_data: - description: Role data for the Cinder Dell EMC XTREMIO Iscsi backend. - value: - service_name: cinder_backend_dellemc_xtremio_iscsi - config_settings: - map_merge: - - tripleo::profile::base::cinder::volume::cinder_enable_dellemc_xtremio_iscsi_backend: {get_param: CinderEnableDellEMCXTREMIOIscsiBackend} - cinder::backend::dellemc_xtremio_iscsi::volume_backend_name: {get_param: CinderDellEMCXTREMIOIscsiBackendName} - cinder::backend::dellemc_xtremio_iscsi::san_ip: {get_param: CinderDellEMCXTREMIOIscsiSanIp} - cinder::backend::dellemc_xtremio_iscsi::san_login: {get_param: CinderDellEMCXTREMIOIscsiSanLogin} - cinder::backend::dellemc_xtremio_iscsi::san_password: {get_param: CinderDellEMCXTREMIOIscsiSanPassword} - cinder::backend::dellemc_xtremio_iscsi::xtremio_cluster_name: {get_param: CinderDellEMCXTREMIOIscsiClusterName} - cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_count: {get_param: CinderDellEMCXTREMIOIscsiArrayBusyRetryCount} - cinder::backend::dellemc_xtremio_iscsi::xtremio_array_busy_retry_interval: {get_param: CinderDellEMCXTREMIOIscsiArrayBusyRetryInterval} - cinder::backend::dellemc_xtremio_iscsi::xtremio_volumes_per_glance_cache: {get_param: CinderDellEMCXTREMIOIscsiVolumesPerGlanceCache} - cinder::backend::dellemc_xtremio_iscsi::xtremio_ports: {get_param: CinderDellEMCXTREMIOIscsiPorts} - - if: - - not: {equals : [{get_param: CinderDellEMCXTREMIOIscsiAvailabilityZone}, '']} - - cinder::backend::dellemc_xtremio_iscsi::backend_availability_zone: {get_param: CinderDellEMCXTREMIOIscsiAvailabilityZone} diff --git a/environments/cinder-dellemc-xtremio-iscsi-config.yaml b/environments/cinder-dellemc-xtremio-iscsi-config.yaml deleted file mode 100644 index 4c80987a97..0000000000 --- a/environments/cinder-dellemc-xtremio-iscsi-config.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# A Heat environment file which can be used to enable a -# Cinder Dell EMC XTREMIOIscsi backend, configured via puppet -# Please note, this template is deprecated now. -# Use Cinder Dell EMC Xtremio backend template defined in -# cinder-backend-dellemc-xtremio-puppet.yaml. -resource_registry: - OS::TripleO::Services::CinderBackendDellEMCXTREMIOIscsi: ../deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml - -parameter_defaults: - CinderEnableDellEMCXTREMIOIscsiBackend: true - CinderDellEMCXTREMIOIscsiBackendName: 'tripleo_dellemc_xtremio_iscsi' - CinderDellEMCXTREMIOIscsiSanIp: '' - CinderDellEMCXTREMIOIscsiSanLogin: 'admin' - CinderDellEMCXTREMIOIscsiSanPassword: '' - CinderDellEMCXTREMIOIscsiClusterName: 'Cluster-Name' - CinderDellEMCXTREMIOIscsiArrayBusyRetryCount: 5 - CinderDellEMCXTREMIOIscsiArrayBusyRetryInterval: 5 - CinderDellEMCXTREMIOIscsiVolumesPerGlanceCache: 100 - CinderDellEMCXTREMIOIscsiPorts: '' diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 1274747757..bde6b0ea2d 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -279,7 +279,6 @@ resource_registry: OS::TripleO::Services::CinderBackendDellEMCVNX: OS::Heat::None OS::TripleO::Services::CinderBackendDellEMCVxFlexOS: OS::Heat::None OS::TripleO::Services::CinderBackendDellEMCXtremio: OS::Heat::None - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI: OS::Heat::None OS::TripleO::Services::CinderBackendNetApp: OS::Heat::None OS::TripleO::Services::CinderBackendPure: OS::Heat::None OS::TripleO::Services::CinderBackendScaleIO: OS::Heat::None diff --git a/releasenotes/notes/xtremio-iscsi-remove-deprecated-68a8830be3d4f2b8.yaml b/releasenotes/notes/xtremio-iscsi-remove-deprecated-68a8830be3d4f2b8.yaml new file mode 100644 index 0000000000..d7048a5b0c --- /dev/null +++ b/releasenotes/notes/xtremio-iscsi-remove-deprecated-68a8830be3d4f2b8.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Remove deprecated OS::TripleO::Services::CinderBackendDellEMCXTREMIOIscsi. + Use OS::TripleO::Services::CinderBackendDellEMCXtremio instead. \ No newline at end of file diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 6d9812af6a..cb83c6cfee 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -70,7 +70,6 @@ - OS::TripleO::Services::CinderBackendDellEMCVNX - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS - OS::TripleO::Services::CinderBackendDellEMCXtremio - - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendScaleIO diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 0c96f16ce5..c562b9c8ec 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -58,7 +58,6 @@ - OS::TripleO::Services::CinderBackendDellEMCVNX - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS - OS::TripleO::Services::CinderBackendDellEMCXtremio - - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendScaleIO diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 2b69c7b29e..302c0e9f9e 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -52,7 +52,6 @@ - OS::TripleO::Services::CinderBackendDellEMCVNX - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS - OS::TripleO::Services::CinderBackendDellEMCXtremio - - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendScaleIO diff --git a/roles/ControllerSriov.yaml b/roles/ControllerSriov.yaml index 7b199f55eb..12dbc83781 100644 --- a/roles/ControllerSriov.yaml +++ b/roles/ControllerSriov.yaml @@ -62,7 +62,6 @@ - OS::TripleO::Services::CinderBackendDellEMCUnity - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI - OS::TripleO::Services::CinderBackendDellEMCVNX - - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendScaleIO diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index 800b292578..34e824c517 100644 --- a/roles/ControllerStorageDashboard.yaml +++ b/roles/ControllerStorageDashboard.yaml @@ -68,7 +68,6 @@ - OS::TripleO::Services::CinderBackendDellEMCVNX - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS - OS::TripleO::Services::CinderBackendDellEMCXtremio - - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendScaleIO diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 86b836dbf3..5a4a9e6fcf 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -69,7 +69,6 @@ - OS::TripleO::Services::CinderBackendDellEMCVNX - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS - OS::TripleO::Services::CinderBackendDellEMCXtremio - - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendScaleIO diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index 383910ce73..ae01cbfc98 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -64,7 +64,6 @@ - OS::TripleO::Services::CinderBackendDellEMCVNX - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS - OS::TripleO::Services::CinderBackendDellEMCXtremio - - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI - OS::TripleO::Services::CinderBackendDellSc - OS::TripleO::Services::CinderBackendNVMeOF - OS::TripleO::Services::CinderBackendPure diff --git a/roles_data.yaml b/roles_data.yaml index c2c1cf92d0..1b91ac6459 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -73,7 +73,6 @@ - OS::TripleO::Services::CinderBackendDellEMCVNX - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS - OS::TripleO::Services::CinderBackendDellEMCXtremio - - OS::TripleO::Services::CinderBackendDellEMCXTREMIOISCSI - OS::TripleO::Services::CinderBackendNetApp - OS::TripleO::Services::CinderBackendPure - OS::TripleO::Services::CinderBackendScaleIO