openstack/puppet-cinder
Code Issues Proposed changes

Merge "Remove support for HPE Lefthand driver"

Browse Source
This commit is contained in:
Zuul 2021-04-23 18:38:36 +00:00 committed by Gerrit Code Review
commit 8244283aea
3 changed files with 4 additions and 151 deletions

91
manifests/backend/hpelefthand_iscsi.pp

@ -1,91 +0,0 @@
# DEPRECATED !!
# Configures Cinder volume HPE lefthand ISCSI driver.
# Parameters are particular to each volume driver.
#
# === Parameters
#
# [*hpelefthand_api_url*]
# (required) url for api access to lefthand - example https://10.x.x.x:8080/api/v1
#
# [*hpelefthand_username*]
# (required) Username for HPElefthand admin user
#
# [*hpelefthand_password*]
# (required) Password for hpelefthand_username
#
# [*volume_backend_name*]
# (optional) Allows for the volume_backend_name to be separate of $name.
# Defaults to: $name
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this volume backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $::os_service_default.
#
# [*volume_driver*]
# (optional) Setup cinder-volume to use HPE LeftHand volume driver.
# Defaults to 'cinder.volume.drivers.hpe.hpe_lefthand_iscsi.HPELeftHandISCSIDriver'
#
# [*hpelefthand_iscsi_chap_enabled*]
# (required) setting to false by default
#
# [*hpelefthand_clustername*]
# (required) clustername of hpelefthand
#
# [*hpelefthand_debug*]
# (required) setting to false by default
#
# [*manage_volume_type*]
# (Optional) Whether or not manage Cinder Volume type.
# If set to true, a Cinder Volume type will be created
# with volume_backend_name=$volume_backend_name key/value.
# Defaults to false.
#
# [*extra_options*]
# (optional) Hash of extra options to pass to the backend stanza
# Defaults to: {}
# Example :
# { 'hpelefthand_iscsi_backend/param1' => { 'value' => value1 } }
#
define cinder::backend::hpelefthand_iscsi(
$hpelefthand_api_url,
$hpelefthand_username,
$hpelefthand_password,
$hpelefthand_clustername,
$volume_backend_name = $name,
$backend_availability_zone = $::os_service_default,
$volume_driver = 'cinder.volume.drivers.hpe.hpe_lefthand_iscsi.HPELeftHandISCSIDriver',
$hpelefthand_iscsi_chap_enabled = false,
$hpelefthand_debug = false,
$manage_volume_type = false,
$extra_options = {},
) {
include cinder::deps
warning('The support for HPE Lefthand Driver has been deprecated and will
be removed in a future release')
cinder_config {
"${name}/volume_backend_name": value => $volume_backend_name;
"${name}/backend_availability_zone": value => $backend_availability_zone;
"${name}/volume_driver": value => $volume_driver;
"${name}/hpelefthand_username": value => $hpelefthand_username;
"${name}/hpelefthand_password": value => $hpelefthand_password, secret => true;
"${name}/hpelefthand_clustername": value => $hpelefthand_clustername;
"${name}/hpelefthand_api_url": value => $hpelefthand_api_url;
"${name}/hpelefthand_iscsi_chap_enabled": value => $hpelefthand_iscsi_chap_enabled;
"${name}/hpelefthand_debug": value => $hpelefthand_debug;
}
if $manage_volume_type {
cinder_type { $volume_backend_name:
ensure => present,
properties => ["volume_backend_name=${volume_backend_name}"],
}
}
create_resources('cinder_config', $extra_options)
}

4
releasenotes/notes/remove-hpelefthand-support-aad4190684256154.yaml Normal file

@ -0,0 +1,4 @@
---
upgrade:
- |
The support for HPE Lefthand driver has been removed.

60
spec/defines/cinder_backend_hpelefthand_iscsi_spec.rb

@ -1,60 +0,0 @@
require 'spec_helper'
describe 'cinder::backend::hpelefthand_iscsi' do
let (:title) { 'hpelefthand_iscsi' }
let :req_params do
{
:backend_availability_zone => 'my_zone',
:hpelefthand_api_url => 'https://10.206.219.18:8081/lhos',
:hpelefthand_username => 'admin',
:hpelefthand_password => 'password',
:hpelefthand_clustername => 'nfvsys_clust_001',
}
end
let :params do
req_params
end
shared_examples 'cinder::backend::hpelefthand_iscsi' do
context 'hpelefthand_iscsi volume driver' do
it {
is_expected.to contain_cinder_config('hpelefthand_iscsi/volume_driver').with_value('cinder.volume.drivers.hpe.hpe_lefthand_iscsi.HPELeftHandISCSIDriver')
is_expected.to contain_cinder_config('hpelefthand_iscsi/backend_availability_zone').with_value('my_zone')
is_expected.to contain_cinder_config('hpelefthand_iscsi/hpelefthand_api_url').with_value('https://10.206.219.18:8081/lhos')
is_expected.to contain_cinder_config('hpelefthand_iscsi/hpelefthand_username').with_value('admin')
is_expected.to contain_cinder_config('hpelefthand_iscsi/hpelefthand_password').with_value('password')
is_expected.to contain_cinder_config('hpelefthand_iscsi/hpelefthand_clustername').with_value('nfvsys_clust_001')
}
end
context 'hpelefthand_iscsi backend with additional configuration' do
before :each do
params.merge!({:extra_options => {'hpelefthand_iscsi/param1' => {'value' => 'value1'}}})
end
it { is_expected.to contain_cinder_config('hpelefthand_iscsi/param1').with_value('value1') }
end
context 'hpelefthand_iscsi backend with cinder type' do
before :each do
params.merge!({:manage_volume_type => true})
end
it { is_expected.to contain_cinder_type('hpelefthand_iscsi').with(:ensure => :present, :properties => ['volume_backend_name=hpelefthand_iscsi']) }
end
end
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge!(OSDefaults.get_facts())
end
it_behaves_like 'cinder::backend::hpelefthand_iscsi'
end
end
end