Cinder: Remove support for HPE Lefthand driver

The HEP Lefthand driver was removed from cinder during Ussuri release
and puppet-cinder also dropped support for the driver during Xena
cycle.

Closes-Bug: #1933709
Change-Id: If0e72c48212b867f0d9162f58e67099ac7350c4e
This commit is contained in:
Takashi Kajinami 2021-06-26 12:28:58 +09:00
parent dfbb21ea6d
commit ef7254edd2
14 changed files with 8 additions and 97 deletions

View File

@ -1,73 +0,0 @@
heat_template_version: wallaby
description: >
Configure Cinder HPELeftHandISCSIDriver
parameters:
# Config specific parameters, to be provided via parameter_defaults
CinderHPELeftHandISCSIApiUrl:
type: string
CinderHPELeftHandISCSIUserName:
type: string
CinderHPELeftHandISCSIPassword:
type: string
hidden: true
CinderHPELeftHandISCSIBackendName:
type: string
default: 'tripleo_hpelefthand'
CinderHPELeftHandISCSIAvailabilityZone:
default: ''
description: >
The availability zone of the HPE LeftHand iSCSI Cinder backend.
When set, it overrides the default CinderStorageAvailabilityZone.
type: string
CinderHPELeftHandISCSIChapEnabled:
type: boolean
default: false
CinderHPELeftHandClusterName:
type: string
CinderHPELeftHandDebug:
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. 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.
outputs:
role_data:
description: Role data for Cinder HPELeftHandISCSIDriver
value:
service_name: cinder_hpelefthand_iscsi
config_settings:
map_merge:
- tripleo::profile::base::cinder::volume::cinder_enable_hpelefthand_backend: true
cinder::backend::hpelefthand_iscsi::hpelefthand_api_url: {get_param: CinderHPELeftHandISCSIApiUrl}
cinder::backend::hpelefthand_iscsi::hpelefthand_username: {get_param: CinderHPELeftHandISCSIUserName}
cinder::backend::hpelefthand_iscsi::hpelefthand_password: {get_param: CinderHPELeftHandISCSIPassword}
cinder::backend::hpelefthand_iscsi::volume_backend_name: {get_param: CinderHPELeftHandISCSIBackendName}
cinder::backend::hpelefthand_iscsi::hpelefthand_iscsi_chap_enabled: {get_param: CinderHPELeftHandISCSIChapEnabled}
cinder::backend::hpelefthand_iscsi::hpelefthand_clustername: {get_param: CinderHPELeftHandClusterName}
cinder::backend::hpelefthand_iscsi::hpelefthand_debug: {get_param: CinderHPELeftHandDebug}
- if:
- not: {equals : [{get_param: CinderHPELeftHandISCSIAvailabilityZone}, '']}
- cinder::backend::hpelefthand_iscsi::backend_availability_zone: {get_param: CinderHPELeftHandISCSIAvailabilityZone}

View File

@ -1,13 +0,0 @@
# A Heat environment file which can be used to enable a
# a Cinder HPELeftHandISCSI backend, configured via puppet
resource_registry:
OS::TripleO::Services::CinderHPELeftHandISCSI: ../deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml
parameter_defaults:
CinderHPELeftHandISCSIApiUrl: ''
CinderHPELeftHandISCSIUserName: ''
CinderHPELeftHandISCSIPassword: ''
CinderHPELeftHandISCSIBackendName: 'tripleo_hpelefthand'
CinderHPELeftHandISCSIChapEnabled: false
CinderHPELeftHandClusterName: ''
CinderHPELeftHandDebug: false

View File

@ -291,7 +291,6 @@ resource_registry:
OS::TripleO::Services::CinderBackendPure: OS::Heat::None
OS::TripleO::Services::CinderBackendScaleIO: OS::Heat::None
OS::TripleO::Services::CinderBackendNVMeOF: OS::Heat::None
OS::TripleO::Services::CinderHPELeftHandISCSI: OS::Heat::None
OS::TripleO::Services::CinderVolumeEdge: OS::Heat::None
OS::TripleO::Services::Etcd: OS::Heat::None
OS::TripleO::Services::AuditD: OS::Heat::None

View File

@ -0,0 +1,8 @@
---
upgrade:
- |
Support for the HPE Lefthand cinder driver has been removed.
- |
The ``OS::TripleO::Services::CinderHPELeftHandISCSI`` service was removed,
so it should be removed from role data during upgrade.

View File

@ -77,7 +77,6 @@
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendNVMeOF
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Clustercheck

View File

@ -46,7 +46,6 @@
- OS::TripleO::Services::CephRgw
- OS::TripleO::Services::CinderApi
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Collectd

View File

@ -65,7 +65,6 @@
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendNVMeOF
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Clustercheck

View File

@ -58,7 +58,6 @@
- OS::TripleO::Services::CinderBackendPure
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Clustercheck

View File

@ -51,7 +51,6 @@
- OS::TripleO::Services::CephRgw
- OS::TripleO::Services::CinderApi
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Collectd

View File

@ -69,7 +69,6 @@
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendNVMeOF
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Clustercheck

View File

@ -75,7 +75,6 @@
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendNVMeOF
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Clustercheck

View File

@ -76,7 +76,6 @@
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendNVMeOF
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Clustercheck

View File

@ -70,7 +70,6 @@
- OS::TripleO::Services::CinderBackendNetApp
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Clustercheck

View File

@ -80,7 +80,6 @@
- OS::TripleO::Services::CinderBackendScaleIO
- OS::TripleO::Services::CinderBackendNVMeOF
- OS::TripleO::Services::CinderBackup
- OS::TripleO::Services::CinderHPELeftHandISCSI
- OS::TripleO::Services::CinderScheduler
- OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Clustercheck