Merge "Cinder: Remove support for deprecated Dell EMC volume drivers"

ci/custom_ci_roles_data.yaml

@@ -71,13 +71,10 @@
     - OS::TripleO::Services::CinderBackendDellEMCPowerStore
     - OS::TripleO::Services::CinderBackendDellEMCSc
     - OS::TripleO::Services::CinderBackendDellEMCUnity
-    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
     - OS::TripleO::Services::CinderBackendDellEMCVNX
-    - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS
     - OS::TripleO::Services::CinderBackendDellEMCXtremio
     - OS::TripleO::Services::CinderBackendNetApp
     - OS::TripleO::Services::CinderBackendPure
-    - OS::TripleO::Services::CinderBackendScaleIO
     - OS::TripleO::Services::CinderBackendNVMeOF
     - OS::TripleO::Services::CinderBackup
     - OS::TripleO::Services::CinderScheduler

deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml

@@ -1,172 +0,0 @@
-# Copyright (c) 2020 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.
-#
-#  Please note, this template is deprecated now.
-#  Use Cinder Dell EMC PowerFlex backend template defined in
-#  cinder-backend-dellemc-powerflex-puppet.yaml.
-
-heat_template_version: wallaby
-
-description: >
-  Openstack Cinder Dell EMC VxFlexOS backend
-
-parameters:
-  CinderEnableVxFlexOSBackend:
-    type: boolean
-    default: true
-  CinderVxFlexOSBackendName:
-    type: string
-    default: 'tripleo_dellemc_VxFlexOS'
-  CinderVxFlexOSAvailabilityZone:
-    default: ''
-    description: >
-      The availability zone of the VxFlexOS Cinder backend.
-      When set, it overrides the default CinderStorageAvailabilityZone.
-    type: string
-  CinderVxFlexOSSanIp:
-    type: string
-    description: VxFlexOS Gateway server IP
-  CinderVxFlexOSSanLogin:
-    type: string
-    description: VxFlexOS user credentials.
-  CinderVxFlexOSSanPassword:
-    type: string
-    hidden: true
-    description: VxFlexOS user password.
-  CinderVxFlexOSStoragePools:
-    type: string
-    description: >
-      Storage Pools. Comma separated list of storage pools used to provide
-      volumes. Each pool should be specified as a
-      protection_domain_name:storage_pool_name value
-  CinderVxFlexOSAllowMigrationDuringRebuild:
-    type: boolean
-    default: false
-    description: Allow volume migration during rebuild.
-  CinderVxFlexOSAllowNonPaddedVolumes:
-    type: boolean
-    default: false
-    description: >
-      Allow volumes to be created in Storage Pools when zero padding is
-      disabled. This option should not be enabled if multiple tenants will
-      utilize volumes from a shared Storage Pool.
-  CinderVxFlexOSMaxOverSubscriptionRatio:
-    type: number
-    default: 10.0
-    description: Maximum value allowed is 10.0.
-  CinderVxFlexOSRestServerPort:
-    type: number
-    default: 443
-    description: (Port(min=0, max=65535)) VxFlexOS Gateway REST server port.
-  CinderVxFlexOSRoundVolumeCapacity:
-    type: boolean
-    default: true
-    description: >
-      Round volume sizes up to 8GB boundaries. VxFlex OS requires volumes to be
-      sized in multiples of 8GB. If set to False, volume creation will fail for
-      volumes not sized properly.
-  CinderVxFlexOSServerApiVersion:
-    type: string
-    default: ''
-    description: VxFlexOS API version.
-  CinderVxFlexOSUnmapVolumeBeforeDeletion:
-    type: boolean
-    default: false
-    description: Unmap volumes before deletion.
-  CinderVxFlexOSSanThinProvision:
-    type: boolean
-    default: true
-    description: Wheater to use thin provisioning or not.
-  CinderVxFlexOSDriverSSLCertVerify:
-    type: boolean
-    default: false
-    description: Verify the server certificate.
-  CinderVxFlexOSDriverSSLCertPath:
-    type: string
-    default: ''
-    description: Server certificate path.
-  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: {}
-    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:
-  - CinderEnableVxFlexOSBackend
-  - CinderVxFlexOSBackendName
-  - CinderVxFlexOSAvailabilityZone
-  - CinderVxFlexOSSanIp
-  - CinderVxFlexOSSanLogin
-  - CinderVxFlexOSSanPassword
-  - CinderVxFlexOSStoragePools
-  - CinderVxFlexOSAllowMigrationDuringRebuild
-  - CinderVxFlexOSAllowNonPaddedVolumes
-  - CinderVxFlexOSMaxOverSubscriptionRatio
-  - CinderVxFlexOSRestServerPort
-  - CinderVxFlexOSServerApiVersion
-  - CinderVxFlexOSUnmapVolumeBeforeDeletion
-  - CinderVxFlexOSSanThinProvision
-  - CinderVxFlexOSDriverSSLCertVerify
-  - CinderVxFlexOSDriverSSLCertPath
-
-outputs:
-  role_data:
-    description: Role data for the Cinder Dell EMC VxFlexOS backend.
-    value:
-      service_name: cinder_backend_vxflexos
-      config_settings:
-        map_merge:
-          - tripleo::profile::base::cinder::volume::cinder_enable_dellemc_vxflexos_backend: {get_param: CinderEnableVxFlexOSBackend}
-            cinder::backend::dellemc_vxflexos::volume_backend_name: {get_param: CinderVxFlexOSBackendName}
-            cinder::backend::dellemc_vxflexos::san_login: {get_param: CinderVxFlexOSSanLogin}
-            cinder::backend::dellemc_vxflexos::san_password: {get_param: CinderVxFlexOSSanPassword}
-            cinder::backend::dellemc_vxflexos::san_ip: {get_param: CinderVxFlexOSSanIp}
-            cinder::backend::dellemc_vxflexos::vxflexos_storage_pools: {get_param: CinderVxFlexOSStoragePools}
-            cinder::backend::dellemc_vxflexos::vxflexos_allow_migration_during_rebuild: {get_param: CinderVxFlexOSAllowMigrationDuringRebuild}
-            cinder::backend::dellemc_vxflexos::vxflexos_allow_non_padded_volumes: {get_param: CinderVxFlexOSAllowNonPaddedVolumes}
-            cinder::backend::dellemc_vxflexos::vxflexos_max_over_subscription_ratio: {get_param: CinderVxFlexOSMaxOverSubscriptionRatio}
-            cinder::backend::dellemc_vxflexos::vxflexos_rest_server_port: {get_param: CinderVxFlexOSRestServerPort}
-            cinder::backend::dellemc_vxflexos::vxflexos_round_volume_capacity: {get_param: CinderVxFlexOSRoundVolumeCapacity}
-            cinder::backend::dellemc_vxflexos::vxflexos_server_api_version: {get_param: CinderVxFlexOSRoundVolumeCapacity}
-            cinder::backend::dellemc_vxflexos::vxflexos_unmap_volume_before_deletion: {get_param: CinderVxFlexOSUnmapVolumeBeforeDeletion}
-            cinder::backend::dellemc_vxflexos::san_thin_provision: {get_param: CinderVxFlexOSSanThinProvision}
-            cinder::backend::dellemc_vxflexos::driver_ssl_cert_verify: {get_param: CinderVxFlexOSDriverSSLCertVerify}
-            cinder::backend::dellemc_vxflexos::driver_ssl_cert_path: {get_param: CinderVxFlexOSDriverSSLCertPath}
-          -
-            if:
-            - {equals : [{get_param: CinderVxFlexOSAvailabilityZone}, '']}
-            - {}
-            - cinder::backend::dellemc_vxflexos::backend_availability_zone: {get_param: CinderVxFlexOSAvailabilityZone}

deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml

@@ -1,153 +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.
-heat_template_version: wallaby
-
-description: >
-  Openstack Cinder Dell EMC ScaleIO backend
-  Please note, this template is deprecated now.
-  Use Cinder Dell EMC VxFlexOS backend template defined in
-  cinder-backend-dellemc-vxflexos-puppet.yaml.
-parameters:
-  CinderEnableScaleIOBackend:
-    type: boolean
-    default: true
-  CinderScaleIOBackendName:
-    type: string
-    default: 'tripleo_scaleio'
-  CinderScaleIOAvailabilityZone:
-    default: ''
-    description: >
-      The availability zone of the ScaleIO Cinder backend.
-      When set, it overrides the default CinderStorageAvailabilityZone.
-    type: string
-  CinderScaleIOSanIp:
-    type: string
-    default: ''
-  CinderScaleIOSanLogin:
-    type: string
-    default: ''
-  CinderScaleIOSanPassword:
-    type: string
-    default: ''
-    hidden: true
-  CinderScaleIORestServerPort:
-    type: number
-    default: 443
-  CinderScaleIOVerifyServerCertificate:
-    type: boolean
-    default: false
-  CinderScaleIOServerCertificatePath:
-    type: string
-    default: ''
-  CinderScaleIOProtectionDomainId:
-    type: string
-    default: ''
-  CinderScaleIOProtectionDomainName:
-    type: string
-    default: ''
-  CinderScaleIOStoragePoolId:
-    type: string
-    default: ''
-  CinderScaleIOStoragePoolName:
-    type: string
-    default: ''
-  CinderScaleIOStoragePools:
-    type: string
-    default: ''
-  CinderScaleIORoundVolumeCapacity:
-    type: boolean
-    default: true
-  CinderScaleIOUnmapVolumeBeforeDeletion:
-    type: boolean
-    default: false
-  CinderScaleIOMaxOverSubscriptionRatio:
-    type: string
-    default: ''
-  CinderScaleIOSanThinProvision:
-    type: boolean
-    default: true
-  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: {}
-    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:
-  - CinderEnableScaleIOBackend
-  - CinderScaleIOBackendName
-  - CinderScaleIOSanIp
-  - CinderScaleIOSanLogin
-  - CinderScaleIOSanPassword
-  - CinderScaleIORestServerPort
-  - CinderScaleIOVerifyServerCertificate
-  - CinderScaleIOServerCertificatePath
-  - CinderScaleIOProtectionDomainName
-  - CinderScaleIOStoragePoolName
-  - CinderScaleIOStoragePools
-  - CinderScaleIORoundVolumeCapacity
-  - CinderScaleIOUnmapVolumeBeforeDeletion
-  - CinderScaleIOMaxOverSubscriptionRatio
-  - CinderScaleIOSanThinProvision
-
-outputs:
-  role_data:
-    description: Role data for the Cinder Dell EMC ScaleIO backend.
-    value:
-      service_name: cinder_backend_scaleio
-      config_settings:
-        map_merge:
-          - tripleo::profile::base::cinder::volume::cinder_enable_scaleio_backend: {get_param: CinderEnableScaleIOBackend}
-            cinder::backend::scaleio::volume_backend_name: {get_param: CinderScaleIOBackendName}
-            cinder::backend::scaleio::sio_login: {get_param: CinderScaleIOSanLogin}
-            cinder::backend::scaleio::sio_password: {get_param: CinderScaleIOSanPassword}
-            cinder::backend::scaleio::sio_server_hostname: {get_param: CinderScaleIOSanIp}
-            cinder::backend::scaleio::sio_server_port: {get_param: CinderScaleIORestServerPort}
-            cinder::backend::scaleio::sio_verify_server_certificate: {get_param: CinderScaleIOVerifyServerCertificate}
-            cinder::backend::scaleio::sio_server_certificate_path: {get_param: CinderScaleIOServerCertificatePath}
-            cinder::backend::scaleio::sio_protection_domain_name: {get_param: CinderScaleIOProtectionDomainName}
-            cinder::backend::scaleio::sio_protection_domain_id: {get_param: CinderScaleIOProtectionDomainId}
-            cinder::backend::scaleio::sio_storage_pool_id: {get_param: CinderScaleIOStoragePoolId}
-            cinder::backend::scaleio::sio_storage_pool_name: {get_param: CinderScaleIOStoragePoolName}
-            cinder::backend::scaleio::sio_storage_pools: {get_param: CinderScaleIOStoragePools}
-            cinder::backend::scaleio::sio_round_volume_capacity: {get_param: CinderScaleIORoundVolumeCapacity}
-            cinder::backend::scaleio::sio_unmap_volume_before_deletion: {get_param: CinderScaleIOUnmapVolumeBeforeDeletion}
-            cinder::backend::scaleio::sio_max_over_subscription_ratio: {get_param: CinderScaleIOMaxOverSubscriptionRatio}
-            cinder::backend::scaleio::sio_thin_provision: {get_param: CinderScaleIOSanThinProvision}
-          -
-            if:
-            - {equals : [{get_param: CinderScaleIOAvailabilityZone}, '']}
-            - {}
-            - cinder::backend::scaleio::backend_availability_zone: {get_param: CinderScaleIOAvailabilityZone}

environments/cinder-dellemc-vmax-iscsi-config.yaml

@@ -1,12 +0,0 @@
-# A Heat environment file which can be used to enable a
-# Cinder Dell EMC VMAX backend, configured via puppet
-# Please note, this template is not supported anymore.
-# Use Cinder Dell EMC Powermax backend template defined in
-# cinder-backend-dellemc-powermax.yaml.
-resource_registry:
-  OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI: ../deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml
-
-parameter_defaults:
-  CinderEnableDellEMCVMAXISCSIBackend: true
-  CinderDellEMCVMAXISCSIBackendName: 'tripleo_dellemc_vmax_iscsi'
-  CinderDellEMCVMAXISCSIConfigFile: ''

environments/cinder-dellemc-vxflexos-config.yaml

@@ -1,39 +0,0 @@
-# Copyright (c) 2020 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 VxFlexOS backend, configured via puppet
-#
-#  Please note, this template is deprecated now.
-#  Use Cinder Dell EMC PowerFlex backend template defined in
-#  cinder-backend-dellemc-powerflex-puppet.yaml.
-resource_registry:
-  OS::TripleO::Services::CinderBackendDellEMCVxFlexOS: ../deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml
-
-parameter_defaults:
-  CinderEnableVxFlexOSBackend: true
-  CinderVxFlexOSBackendName: 'tripleo_dellemc_vxflexos'
-  CinderVxFlexOSSanIp: ''
-  CinderVxFlexOSSanLogin: ''
-  CinderVxFlexOSSanPassword: ''
-  CinderVxFlexOSStoragePools: 'domain1:pool1'
-  CinderVxFlexOSAllowMigrationDuringRebuild: false
-  CinderVxFlexOSAllowNonPaddedVolumes: false
-  CinderVxFlexOSMaxOverSubscriptionRatio: 7.0
-  CinderVxFlexOSRestServerPort: 443
-  CinderVxFlexOSServerApiVersion: ''
-  CinderVxFlexOSUnmapVolumeBeforeDeletion: false
-  CinderVxFlexOSSanThinProvision: true
-  CinderVxFlexOSDriverSSLCertVerify: false
-  CinderVxFlexOSDriverSSLCertPath: ''

environments/cinder-scaleio-config.yaml

@@ -1,39 +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 ScaleIO backend, configured via puppet
-#
-#  Please note, this template is deprecated now.
-#  Use Cinder Dell EMC VxFlexOS backend template defined in
-#  cinder-backend-dellemc-vxflexos-puppet.yaml.
-resource_registry:
-  OS::TripleO::Services::CinderBackendScaleIO: ../deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml
-
-parameter_defaults:
-  CinderEnableScaleIOBackend: true
-  CinderScaleIOBackendName: 'tripleo_scaleio'
-  CinderScaleIOSanIp: ''
-  CinderScaleIOSanLogin: ''
-  CinderScaleIOSanPassword: ''
-  CinderScaleIORestServerPort: '443'
-  CinderScaleIOVerifyServerCertificate: false
-  CinderScaleIOServerCertificatePath: ''
-  CinderScaleIOProtectionDomainName: 'domain1'
-  CinderScaleIOStoragePoolName: 'pool1'
-  CinderScaleIOStoragePools: 'domain1:pool1'
-  CinderScaleIORoundVolumeCapacity: true
-  CinderScaleIOUnmapVolumeBeforeDeletion: false
-  CinderScaleIOMaxOverSubscriptionRatio: ''
-  CinderScaleIOSanThinProvision: true

environments/containerized-control-plane-dellemc-scaleio.yaml

@@ -1,35 +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.
-#
-#   Configure and include this environment to enable the use of ScaleIO
-#   within a containerized control plane.
-
-parameter_defaults:
-  # Volumes to map into Cinder Volume container
-  # Type: array
-  CinderVolumeOptVolumes:
-   - /opt/emc/scaleio:/opt/emc/scaleio
-   - /bin/emc/scaleio:/bin/emc/scaleio
-
-  # Volume to map into Nova Compute container
-  # Type: array
-  NovaComputeOptVolumes:
-   - /opt/emc/scaleio:/opt/emc/scaleio
-   - /bin/emc/scaleio:/bin/emc/scaleio
-
-  # Volume to map into Glance API container
-  # Type: array
-  GlanceApiOptVolumes:
-   - /opt/emc/scaleio:/opt/emc/scaleio
-   - /bin/emc/scaleio:/bin/emc/scaleio

overcloud-resource-registry-puppet.j2.yaml

@@ -278,13 +278,10 @@ resource_registry:
   OS::TripleO::Services::CinderBackendDellEMCPowermax: OS::Heat::None
   OS::TripleO::Services::CinderBackendDellEMCPowerStore: OS::Heat::None
   OS::TripleO::Services::CinderBackendDellEMCUnity: OS::Heat::None
-  OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI: OS::Heat::None
   OS::TripleO::Services::CinderBackendDellEMCVNX: OS::Heat::None
-  OS::TripleO::Services::CinderBackendDellEMCVxFlexOS: OS::Heat::None
   OS::TripleO::Services::CinderBackendDellEMCXtremio: OS::Heat::None
   OS::TripleO::Services::CinderBackendNetApp: OS::Heat::None
   OS::TripleO::Services::CinderBackendPure: OS::Heat::None
-  OS::TripleO::Services::CinderBackendScaleIO: OS::Heat::None
   OS::TripleO::Services::CinderBackendNVMeOF: OS::Heat::None
   OS::TripleO::Services::CinderVolumeEdge: OS::Heat::None
   OS::TripleO::Services::Etcd: OS::Heat::None

releasenotes/notes/dellemc-driver-cleanup-4a1febdc51ec674c.yaml

@@ -0,0 +1,14 @@
+upgrade:
+  - |
+    Support for the following three volume drivers have been removed.
+
+    - Dell EMC ScaleIO
+    - Dell EMC VxFlexOS
+    - Dell EMC VMAX
+
+  - |
+    The following services should be removed from roles data during upgrade.
+
+    - ``OS::TripleO::Services::CinderBackendScaleIO``
+    - ``OS::TripleO::Services::CinderBackendDellEMCVxFlexOS``
+    - ``OS::Tripleo::Services::CinderBackendDellEMCVMAXISCSI``

roles/Controller.yaml

@@ -68,13 +68,10 @@
     - OS::TripleO::Services::CinderBackendDellEMCPowerStore
     - OS::TripleO::Services::CinderBackendDellEMCSc
     - OS::TripleO::Services::CinderBackendDellEMCUnity
-    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
     - OS::TripleO::Services::CinderBackendDellEMCVNX
-    - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS
     - OS::TripleO::Services::CinderBackendDellEMCXtremio
     - OS::TripleO::Services::CinderBackendNetApp
     - OS::TripleO::Services::CinderBackendPure
-    - OS::TripleO::Services::CinderBackendScaleIO
     - OS::TripleO::Services::CinderBackendNVMeOF
     - OS::TripleO::Services::CinderBackup
     - OS::TripleO::Services::CinderScheduler

roles/ControllerNoCeph.yaml

@@ -56,13 +56,10 @@
     - OS::TripleO::Services::CinderBackendDellEMCPowerStore
     - OS::TripleO::Services::CinderBackendDellEMCSc
     - OS::TripleO::Services::CinderBackendDellEMCUnity
-    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
     - OS::TripleO::Services::CinderBackendDellEMCVNX
-    - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS
     - OS::TripleO::Services::CinderBackendDellEMCXtremio
     - OS::TripleO::Services::CinderBackendNetApp
     - OS::TripleO::Services::CinderBackendPure
-    - OS::TripleO::Services::CinderBackendScaleIO
     - OS::TripleO::Services::CinderBackendNVMeOF
     - OS::TripleO::Services::CinderBackup
     - OS::TripleO::Services::CinderScheduler

roles/ControllerNovaStandalone.yaml

@@ -55,13 +55,10 @@
     - OS::TripleO::Services::CinderBackendDellEMCPowerStore
     - OS::TripleO::Services::CinderBackendDellEMCSc
     - OS::TripleO::Services::CinderBackendDellEMCUnity
-    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
     - OS::TripleO::Services::CinderBackendDellEMCVNX
-    - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS
     - OS::TripleO::Services::CinderBackendDellEMCXtremio
     - OS::TripleO::Services::CinderBackendNetApp
     - OS::TripleO::Services::CinderBackendPure
-    - OS::TripleO::Services::CinderBackendScaleIO
     - OS::TripleO::Services::CinderBackendNVMeOF
     - OS::TripleO::Services::CinderBackup
     - OS::TripleO::Services::CinderScheduler

roles/ControllerSriov.yaml

@@ -62,11 +62,9 @@
     - OS::TripleO::Services::CinderBackendDellPs
     - OS::TripleO::Services::CinderBackendDellSc
     - OS::TripleO::Services::CinderBackendDellEMCUnity
-    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
     - OS::TripleO::Services::CinderBackendDellEMCVNX
     - OS::TripleO::Services::CinderBackendNetApp
     - OS::TripleO::Services::CinderBackendPure
-    - OS::TripleO::Services::CinderBackendScaleIO
     - OS::TripleO::Services::CinderBackendNVMeOF
     - OS::TripleO::Services::CinderBackup
     - OS::TripleO::Services::CinderScheduler

roles/ControllerStorageDashboard.yaml

@@ -66,13 +66,10 @@
     - OS::TripleO::Services::CinderBackendDellEMCPowerStore
     - OS::TripleO::Services::CinderBackendDellEMCSc
     - OS::TripleO::Services::CinderBackendDellEMCUnity
-    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
     - OS::TripleO::Services::CinderBackendDellEMCVNX
-    - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS
     - OS::TripleO::Services::CinderBackendDellEMCXtremio
     - OS::TripleO::Services::CinderBackendNetApp
     - OS::TripleO::Services::CinderBackendPure
-    - OS::TripleO::Services::CinderBackendScaleIO
     - OS::TripleO::Services::CinderBackendNVMeOF
     - OS::TripleO::Services::CinderBackup
     - OS::TripleO::Services::CinderScheduler

roles/ControllerStorageNfs.yaml

@@ -67,13 +67,10 @@
     - OS::TripleO::Services::CinderBackendDellEMCPowerStore
     - OS::TripleO::Services::CinderBackendDellEMCSc
     - OS::TripleO::Services::CinderBackendDellEMCUnity
-    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
     - OS::TripleO::Services::CinderBackendDellEMCVNX
-    - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS
     - OS::TripleO::Services::CinderBackendDellEMCXtremio
     - OS::TripleO::Services::CinderBackendNetApp
     - OS::TripleO::Services::CinderBackendPure
-    - OS::TripleO::Services::CinderBackendScaleIO
     - OS::TripleO::Services::CinderBackendNVMeOF
     - OS::TripleO::Services::CinderBackup
     - OS::TripleO::Services::CinderScheduler

roles/Standalone.yaml

@@ -60,15 +60,12 @@
     - OS::TripleO::Services::CinderBackendDellEMCPowerStore
     - OS::TripleO::Services::CinderBackendDellEMCSc
     - OS::TripleO::Services::CinderBackendDellEMCUnity
-    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
     - OS::TripleO::Services::CinderBackendDellEMCVNX
-    - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS
     - OS::TripleO::Services::CinderBackendDellEMCXtremio
     - OS::TripleO::Services::CinderBackendDellSc
     - OS::TripleO::Services::CinderBackendNVMeOF
     - OS::TripleO::Services::CinderBackendPure
     - OS::TripleO::Services::CinderBackendNetApp
-    - OS::TripleO::Services::CinderBackendScaleIO
     - OS::TripleO::Services::CinderBackup
     - OS::TripleO::Services::CinderScheduler
     - OS::TripleO::Services::CinderVolume

roles_data.yaml

@@ -71,13 +71,10 @@
     - OS::TripleO::Services::CinderBackendDellEMCPowerStore
     - OS::TripleO::Services::CinderBackendDellEMCSc
     - OS::TripleO::Services::CinderBackendDellEMCUnity
-    - OS::TripleO::Services::CinderBackendDellEMCVMAXISCSI
     - OS::TripleO::Services::CinderBackendDellEMCVNX
-    - OS::TripleO::Services::CinderBackendDellEMCVxFlexOS
     - OS::TripleO::Services::CinderBackendDellEMCXtremio
     - OS::TripleO::Services::CinderBackendNetApp
     - OS::TripleO::Services::CinderBackendPure
-    - OS::TripleO::Services::CinderBackendScaleIO
     - OS::TripleO::Services::CinderBackendNVMeOF
     - OS::TripleO::Services::CinderBackup
     - OS::TripleO::Services::CinderScheduler