openstack/puppet-cinder
Code Issues Proposed changes

Update default volume driver on emc_vnx backend

Browse Source 
This patch replaces the default volume driver with a new one,
as the original driver was replaced in Newton.

This also adds new parameter 'storage_protocol', which accompanies the
new driver.

Change-Id: Ic7be02eff15bafe29e9b5bb4d708f6e42a82724b
This commit is contained in:
Trygve Vea 2016-10-26 12:15:57 +02:00
parent 7315a4ff12
commit 9ba23c281d
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/backend/emc_vnx.pp
View File

@ -43,7 +43,11 @@
# #
# [*volume_driver*] # [*volume_driver*]
# (optional) The EMC VNX Driver you want to use # (optional) The EMC VNX Driver you want to use
# Defaults to cinder.volume.drivers.emc.emc_cli_iscsi.EMCCLIISCSIDriver # Defaults to cinder.volume.drivers.emc.vnx.driver.EMCVNXDriver
#
# [*storage_protocol*]
# (optional) Which storage protocol to use.
# Defaults to 'iscsi'
# #
# [*initiator_auto_registration*] # [*initiator_auto_registration*]
# (optinal) Automatically register initiators. # (optinal) Automatically register initiators.
@ -85,7 +89,8 @@ define cinder::backend::emc_vnx (
$san_login = 'admin', $san_login = 'admin',
$volume_backend_name = $name, $volume_backend_name = $name,
$extra_options = {}, $extra_options = {},
$volume_driver = 'cinder.volume.drivers.emc.emc_cli_iscsi.EMCCLIISCSIDriver', $volume_driver = 'cinder.volume.drivers.emc.vnx.driver.EMCVNXDriver',
$storage_protocol = 'iscsi',
$initiator_auto_registration = $::os_service_default, $initiator_auto_registration = $::os_service_default,
$storage_vnx_auth_type = $::os_service_default, $storage_vnx_auth_type = $::os_service_default,
$storage_vnx_security_file_dir = $::os_service_default, $storage_vnx_security_file_dir = $::os_service_default,
@ -112,6 +117,7 @@ define cinder::backend::emc_vnx (
"${name}/storage_vnx_pool_name": value => $storage_vnx_pool_name; "${name}/storage_vnx_pool_name": value => $storage_vnx_pool_name;
"${name}/volume_backend_name": value => $volume_backend_name; "${name}/volume_backend_name": value => $volume_backend_name;
"${name}/volume_driver": value => $volume_driver; "${name}/volume_driver": value => $volume_driver;
"${name}/storage_protocol": value => $storage_protocol;
"${name}/initiator_auto_registration": value => $initiator_auto_registration; "${name}/initiator_auto_registration": value => $initiator_auto_registration;
"${name}/storage_vnx_authentication_type": value => $storage_vnx_auth_type; "${name}/storage_vnx_authentication_type": value => $storage_vnx_auth_type;
"${name}/storage_vnx_security_file_dir": value => $storage_vnx_security_file_dir; "${name}/storage_vnx_security_file_dir": value => $storage_vnx_security_file_dir;

4
releasenotes/notes/emc-vnx-new-driver-3bf454673e5ba9bb.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- The default volume driver for cinder::backend::emc_vnx has been changed to be newton-compatible.
- A new parameter, 'storage_protocol' has been added to cinder::backend::emc_vnx to be newton-compatible.

5
spec/defines/cinder_backend_emc_vnx_spec.rb
View File

@ -22,7 +22,8 @@ describe 'cinder::backend::emc_vnx' do
describe 'emc vnx volume driver' do describe 'emc vnx volume driver' do
it 'configure 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.emc_cli_iscsi.EMCCLIISCSIDriver') 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/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_ip').with_value('127.0.0.2')
is_expected.to contain_cinder_config('emc/san_login').with_value('emc') is_expected.to contain_cinder_config('emc/san_login').with_value('emc')
is_expected.to contain_cinder_config('emc/san_password').with_value('password') is_expected.to contain_cinder_config('emc/san_password').with_value('password')
@ -42,6 +43,7 @@ describe 'cinder::backend::emc_vnx' do
:storage_vnx_security_file_dir => '/etc/secfile/array1', :storage_vnx_security_file_dir => '/etc/secfile/array1',
:naviseccli_path => '/opt/Navisphere/bin/naviseccli', :naviseccli_path => '/opt/Navisphere/bin/naviseccli',
:manage_volume_type => true, :manage_volume_type => true,
:storage_protocol => 'fc',
}) })
end end
@ -50,6 +52,7 @@ describe 'cinder::backend::emc_vnx' do
is_expected.to contain_cinder_config('emc/storage_vnx_authentication_type').with_value(params[:storage_vnx_auth_type]) is_expected.to contain_cinder_config('emc/storage_vnx_authentication_type').with_value(params[:storage_vnx_auth_type])
is_expected.to contain_cinder_config('emc/storage_vnx_security_file_dir').with_value(params[:storage_vnx_security_file_dir]) is_expected.to contain_cinder_config('emc/storage_vnx_security_file_dir').with_value(params[:storage_vnx_security_file_dir])
is_expected.to contain_cinder_config('emc/naviseccli_path').with_value(params[:naviseccli_path]) is_expected.to contain_cinder_config('emc/naviseccli_path').with_value(params[:naviseccli_path])
is_expected.to contain_cinder_config('emc/storage_protocol').with_value(params[:storage_protocol])
end end
it 'should create type with properties' do it 'should create type with properties' do