openstack
/
puppet-cinder
Code Issues Proposed changes

Update several Dell EMC driver paths 

Update the driver paths for following Dell EMC backends:
- Dell SC
- EMC VMAX
- EMC VNX
- EMC Xtremio

Closes-Bug: #1785085
Change-Id: I1626c3892e23d54f75ad5550b625cc04bfa1a4d5
This commit is contained in:
Alan Bishop 2018-08-02 12:52:20 -04:00
parent f9c2235839
commit d392d17c43
9 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/backend/dellemc_vmax_iscsi.pp
View File

@ -15,7 +15,7 @@
#
# [*volume_driver*]
# (optional) The Dell EMC VMAX ISCSI Driver
# Defaults to cinder.volume.drivers.emc.emc_vmax_fc.EMCVMAXISCSIDriver
# Defaults to cinder.volume.drivers.dell_emc.vmax.iscsi.VMAXISCSIDriver
#
# [*manage_volume_type*]
# (Optional) Whether or not manage Cinder Volume type.
@ -33,7 +33,7 @@ define cinder::backend::dellemc_vmax_iscsi (
$cinder_emc_config_file,
$volume_backend_name = $name,
$extra_options = {},
$volume_driver = 'cinder.volume.drivers.emc.emc_vmax_iscsi.EMCVMAXISCSIDriver',
$volume_driver = 'cinder.volume.drivers.dell_emc.vmax.iscsi.VMAXISCSIDriver',
$manage_volume_type = false,
) {

2
manifests/backend/dellemc_xtremio_iscsi.pp
View File

@ -59,7 +59,7 @@ define cinder::backend::dellemc_xtremio_iscsi (
include ::cinder::deps
$driver = 'emc.xtremio.XtremIOISCSIDriver'
$driver = 'dell_emc.xtremio.XtremIOISCSIDriver'
cinder_config {
"${name}/volume_backend_name": value => $volume_backend_name;
"${name}/volume_driver": value => "cinder.volume.drivers.${driver}";

2
manifests/backend/dellsc_iscsi.pp
View File

@ -107,7 +107,7 @@ default of \"srv\" and will be changed to the upstream OpenStack default in N-re
default of \"vol\" and will be changed to the upstream OpenStack default in N-release.")
}
$driver = 'dell.dell_storagecenter_iscsi.DellStorageCenterISCSIDriver'
$driver = 'dell_emc.sc.storagecenter_iscsi.SCISCSIDriver'
cinder_config {
"${name}/volume_backend_name": value => $volume_backend_name;
"${name}/volume_driver": value => "cinder.volume.drivers.${driver}";

4
manifests/backend/emc_vnx.pp
View File

@ -43,7 +43,7 @@
#
# [*volume_driver*]
# (optional) The EMC VNX Driver you want to use
# Defaults to cinder.volume.drivers.emc.vnx.driver.EMCVNXDriver
# Defaults to cinder.volume.drivers.dell_emc.vnx.driver.VNXDriver
#
# [*storage_protocol*]
# (optional) Which storage protocol to use.
@ -88,7 +88,7 @@ define cinder::backend::emc_vnx (
$san_login = 'admin',
$volume_backend_name = $name,
$extra_options = {},
$volume_driver = 'cinder.volume.drivers.emc.vnx.driver.EMCVNXDriver',
$volume_driver = 'cinder.volume.drivers.dell_emc.vnx.driver.VNXDriver',
$storage_protocol = 'iscsi',
$initiator_auto_registration = $::os_service_default,
$storage_vnx_auth_type = $::os_service_default,

6
releasenotes/notes/fix-dellemc-driver-paths-04b5792a3534e4c4.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Update the driver paths for several Dell EMC backends.
Fixes `bug 1785085
<https://bugs.launchpad.net/puppet-cinder/+bug/1785085>`__.

2
spec/defines/cinder_backend_dellemc_vmax_spec.rb
View File

@ -17,7 +17,7 @@ describe 'cinder::backend::dellemc_vmax_iscsi' do
describe 'dell emc vmax iscsi volume driver' do
it 'configure dell emc vmax iscsi volume driver' do
is_expected.to contain_package('pywbem').with(:ensure => :present)
is_expected.to contain_cinder_config('dellemc_vmax_iscsi/volume_driver').with_value('cinder.volume.drivers.emc.emc_vmax_iscsi.EMCVMAXISCSIDriver')
is_expected.to contain_cinder_config('dellemc_vmax_iscsi/volume_driver').with_value('cinder.volume.drivers.dell_emc.vmax.iscsi.VMAXISCSIDriver')
is_expected.to contain_cinder_config('dellemc_vmax_iscsi/cinder_emc_config_file').with_value('/etc/cinder/cinder_emc_config_CONF_GROUP_ISCSI.xml')
end
end

2
spec/defines/cinder_backend_dellemc_xtremio_spec.rb
View File

@ -35,7 +35,7 @@ describe 'cinder::backend::dellemc_xtremio_iscsi' do
it 'configures cinder volume driver' do
is_expected.to contain_cinder__backend__dellemc_xtremio_iscsi(config_group_name)
is_expected.to contain_cinder_config("#{title}/volume_driver").with_value(
'cinder.volume.drivers.emc.xtremio.XtremIOISCSIDriver')
'cinder.volume.drivers.dell_emc.xtremio.XtremIOISCSIDriver')
params_hash.each_pair do |config,value|
is_expected.to contain_cinder_config("#{config_group_name}/#{config}").with_value( value )
end

2
spec/defines/cinder_backend_dellsc_iscsi_spec.rb
View File

@ -45,6 +45,8 @@ describe 'cinder::backend::dellsc_iscsi' do
params_hash.each_pair do |config,value|
is_expected.to contain_cinder_config("#{config_group_name}/#{config}").with_value( value )
end
is_expected.to contain_cinder_config("#{config_group_name}/volume_driver").with_value(
'cinder.volume.drivers.dell_emc.sc.storagecenter_iscsi.SCISCSIDriver')
end
end

2
spec/defines/cinder_backend_emc_vnx_spec.rb
View File

@ -22,7 +22,7 @@ describe 'cinder::backend::emc_vnx' do
describe 'emc vnx volume driver' do
it 'configure emc vnx volume driver' do
is_expected.to contain_cinder_config('emc/volume_driver').with_value('cinder.volume.drivers.emc.vnx.driver.EMCVNXDriver')
is_expected.to contain_cinder_config('emc/volume_driver').with_value('cinder.volume.drivers.dell_emc.vnx.driver.VNXDriver')
is_expected.to contain_cinder_config('emc/storage_protocol').with_value('iscsi')
is_expected.to contain_cinder_config('emc/san_ip').with_value('127.0.0.2')
is_expected.to contain_cinder_config('emc/san_login').with_value('emc')