openstack/puppet-cinder
Code Issues Proposed changes

Merge "hpe3par: Fix wrong option name"

Browse Source
This commit is contained in:
Zuul 2025-03-01 06:00:35 +00:00 committed by Gerrit Code Review
commit d11bd5c607
2 changed files with 12 additions and 3 deletions

7
manifests/backend/hpe3par_iscsi.pp

@ -139,11 +139,16 @@ define cinder::backend::hpe3par_iscsi(
"${name}/hpe3par_iscsi_ips": value => join(any2array($hpe3par_iscsi_ips), ',');
"${name}/hpe3par_api_url": value => $hpe3par_api_url;
"${name}/hpe3par_iscsi_chap_enabled": value => $hpe3par_iscsi_chap_enabled;
"${name}/hpe3par_snap_cpg": value => $hpe3par_cpg_snap;
"${name}/hpe3par_cpg_snap": value => $hpe3par_cpg_snap;
"${name}/hpe3par_snapshot_retention": value => $hpe3par_snapshot_retention;
"${name}/hpe3par_snapshot_expiration": value => $hpe3par_snapshot_expiration;
}
# TODO(tkajinam): Remove this after 2025.1 release
cinder_config {
"${name}/hpe3par_snap_cpg": ensure => absent;
}
if $manage_volume_type {
cinder_type { $volume_backend_name:
ensure => present,

8
spec/defines/cinder_backend_hpe3par_iscsi_spec.rb

@ -31,11 +31,15 @@ describe 'cinder::backend::hpe3par_iscsi' do
is_expected.to contain_cinder_config('hpe3par_iscsi/max_over_subscription_ratio').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('hpe3par_iscsi/hpe3par_api_url').with_value('https://172.0.0.2:8080/api/v1')
is_expected.to contain_cinder_config('hpe3par_iscsi/hpe3par_username').with_value('3paradm')
is_expected.to contain_cinder_config('hpe3par_iscsi/hpe3par_password').with_value('password')
is_expected.to contain_cinder_config('hpe3par_iscsi/hpe3par_password').with_value('password').with_secret(true)
is_expected.to contain_cinder_config('hpe3par_iscsi/hpe3par_iscsi_ips').with_value('172.0.0.3')
is_expected.to contain_cinder_config('hpe3par_iscsi/san_ip').with_value('172.0.0.2')
is_expected.to contain_cinder_config('hpe3par_iscsi/san_login').with_value('3paradm')
is_expected.to contain_cinder_config('hpe3par_iscsi/san_password').with_value('password')
is_expected.to contain_cinder_config('hpe3par_iscsi/san_password').with_value('password').with_secret(true)
is_expected.to contain_cinder_config('hpe3par_iscsi/hpe3par_iscsi_chap_enabled').with_value(false)
is_expected.to contain_cinder_config('hpe3par_iscsi/hpe3par_cpg_snap').with_value('userCPG')
is_expected.to contain_cinder_config('hpe3par_iscsi/hpe3par_snapshot_retention').with_value(48)
is_expected.to contain_cinder_config('hpe3par_iscsi/hpe3par_snapshot_expiration').with_value(72)
}
end