Fix wrong source to define volume_backend_name
The volume_backend_name property in volume types should be set according to the volume_backend_name option, instead of the backend config section name. This change ensures the option value is used consistently among all defined resource types to manage volume backend options. Change-Id: I29c5bcdb0e79f6f98d272995de6a86a0062cea48
This commit is contained in:
parent
c481593371
commit
ae990b2451
|
@ -140,9 +140,9 @@ define cinder::backend::dellemc_powerflex(
|
|||
"${name}/driver_ssl_cert_path": value => $driver_ssl_cert_path;
|
||||
}
|
||||
if $manage_volume_type {
|
||||
cinder_type { $name:
|
||||
cinder_type { $volume_backend_name:
|
||||
ensure => present,
|
||||
properties => ["volume_backend_name=${name}"],
|
||||
properties => ["volume_backend_name=${volume_backend_name}"],
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -241,9 +241,9 @@ and will be removed in a future release.")
|
|||
}
|
||||
|
||||
if $manage_volume_type {
|
||||
cinder_type { $name:
|
||||
cinder_type { $volume_backend_name:
|
||||
ensure => present,
|
||||
properties => ["volume_backend_name=${name}"],
|
||||
properties => ["volume_backend_name=${volume_backend_name}"],
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,8 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
The following defined resource types now create volume types according to
|
||||
the ``volume_backend_name`` parameter, instead of resource names.
|
||||
|
||||
- ``cinder::backend::dellemc_powerflex``
|
||||
- ``cinder::backend::netapp``
|
|
@ -44,8 +44,8 @@ describe 'cinder::backend::gpfs' do
|
|||
default_params.merge(params)
|
||||
end
|
||||
|
||||
it { is_expected.to contain_cinder_config('gpfs/volume_driver').with(
|
||||
:value => 'cinder.volume.drivers.ibm.gpfs.GPFSDriver'
|
||||
it { is_expected.to contain_cinder_config('gpfs/volume_driver').with_value(
|
||||
'cinder.volume.drivers.ibm.gpfs.GPFSDriver'
|
||||
)}
|
||||
|
||||
it {
|
||||
|
|
|
@ -71,9 +71,9 @@ describe 'cinder::backend::netapp' do
|
|||
params.merge!( :manage_volume_type => true )
|
||||
end
|
||||
|
||||
it { is_expected.to contain_cinder_type('netapp').with(
|
||||
it { is_expected.to contain_cinder_type('netapp-cdot-nfs').with(
|
||||
:ensure => 'present',
|
||||
:properties => ['volume_backend_name=netapp']
|
||||
:properties => ['volume_backend_name=netapp-cdot-nfs']
|
||||
)}
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue