diff --git a/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml b/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml deleted file mode 100644 index bf582adc07..0000000000 --- a/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml +++ /dev/null @@ -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} diff --git a/environments/cinder-hpelefthand-config.yaml b/environments/cinder-hpelefthand-config.yaml deleted file mode 100644 index 093374a5a2..0000000000 --- a/environments/cinder-hpelefthand-config.yaml +++ /dev/null @@ -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 diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 35eb766ea6..43ca2542a9 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -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 diff --git a/releasenotes/notes/remove-hpe-lefthand-23c6beaa777e3dfb.yaml b/releasenotes/notes/remove-hpe-lefthand-23c6beaa777e3dfb.yaml new file mode 100644 index 0000000000..8420692855 --- /dev/null +++ b/releasenotes/notes/remove-hpe-lefthand-23c6beaa777e3dfb.yaml @@ -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. diff --git a/roles/Controller.yaml b/roles/Controller.yaml index 101c8bd949..fed509ad52 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -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 diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index 81a05c3e2b..84c9d51021 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -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 diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index cb71070587..f9658777c7 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -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 diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index b1cf14b498..da846143e6 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -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 diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index bdf4f58d69..060de7531e 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -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 diff --git a/roles/ControllerSriov.yaml b/roles/ControllerSriov.yaml index 491f7ad488..15bd2fabb2 100644 --- a/roles/ControllerSriov.yaml +++ b/roles/ControllerSriov.yaml @@ -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 diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index 42d053723b..e68bbe1bd6 100644 --- a/roles/ControllerStorageDashboard.yaml +++ b/roles/ControllerStorageDashboard.yaml @@ -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 diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 6ecb6b65c4..ae6c9ab88d 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -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 diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index 99d5b701db..40cef00818 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -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 diff --git a/roles_data.yaml b/roles_data.yaml index 3f4dc87b45..1b29d8ba14 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -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