openstack/puppet-cinder
Code Issues Proposed changes

Update the solidfire module.

Browse Source 
Include the latest configuration options in the module and tests.
Also fix the puppet-lint issues with the code and tests.

Change-Id: If1cbbb0347e501bd5d2fee7376b815b833051f8f
Closes-Bug: #1555835
This commit is contained in:
Ed Balduf 2016-03-10 15:26:08 -07:00
parent 74fe872e26
commit f9071f1ae9
3 changed files with 118 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
manifests/backend/solidfire.pp
View File

@ -49,6 +49,27 @@
# (optional) Port ID to use to connect to SolidFire API. # (optional) Port ID to use to connect to SolidFire API.
# Defaults to 443 # Defaults to 443
# #
# [*sf_volume_prefix*]
# (optional) Create SolidFire volumes with this prefix. Volume names
# are of the form <sf_volume_prefix><cinder-volume-id>.
# Defaults to UUID-
#
# [*sf_svip*]
# (optional) Overrides default cluster SVIP with the one specified.
# This is required or deployments that have implemented the use of
# VLANs for iSCSI networks in their cloud.
# Defaults to none
#
# [*sf_enable_volume_mapping*]
# (optional) Create an internal mapping of volume IDs and account.
# Optimizes lookups and performance at the expense of memory, very
# large deployments may want to consider setting to False.
# Defaults to true
#
# [*sf_enable_vag*]
# (optional) Utilize volume access groups on a per-tenant basis.
# Defaults to false
#
# [*extra_options*] # [*extra_options*]
# (optional) Hash of extra options to pass to the backend stanza # (optional) Hash of extra options to pass to the backend stanza
# Defaults to: {} # Defaults to: {}
@ -60,28 +81,36 @@ define cinder::backend::solidfire(
$san_login, $san_login,
$san_password, $san_password,
$volume_backend_name = $name, $volume_backend_name = $name,
$volume_driver = 'cinder.volume.drivers.solidfire.SolidFireDriver', $volume_driver = 'cinder.volume.drivers.solidfire.SolidFireDriver',
$sf_emulate_512 = true, $sf_emulate_512 = true,
$sf_allow_tenant_qos = false, $sf_allow_tenant_qos = false,
$sf_account_prefix = '', $sf_account_prefix = '',
$sf_template_account_name = 'openstack-vtemplate', $sf_template_account_name = 'openstack-vtemplate',
$sf_allow_template_caching = false, $sf_allow_template_caching = false,
$sf_api_port = '443', $sf_api_port = '443',
$sf_volume_prefix = 'UUID-',
$sf_svip = '',
$sf_enable_volume_mapping = true,
$sf_enable_vag = false,
$extra_options = {}, $extra_options = {},
) { ) {
cinder_config { cinder_config {
"${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}/san_ip": value => $san_ip; "${name}/san_ip": value => $san_ip;
"${name}/san_login": value => $san_login; "${name}/san_login": value => $san_login;
"${name}/san_password": value => $san_password, secret => true; "${name}/san_password": value => $san_password, secret => true;
"${name}/sf_emulate_512": value => $sf_emulate_512; "${name}/sf_emulate_512": value => $sf_emulate_512;
"${name}/sf_allow_tenant_qos": value => $sf_allow_tenant_qos; "${name}/sf_allow_tenant_qos": value => $sf_allow_tenant_qos;
"${name}/sf_account_prefix": value => $sf_account_prefix; "${name}/sf_account_prefix": value => $sf_account_prefix;
"${name}/sf_template_account_name": value => $sf_template_account_name; "${name}/sf_template_account_name": value => $sf_template_account_name;
"${name}/sf_allow_template_caching": value => $sf_allow_template_caching; "${name}/sf_allow_template_caching": value => $sf_allow_template_caching;
"${name}/sf_api_port": value => $sf_api_port; "${name}/sf_api_port": value => $sf_api_port;
"${name}/sf_volume_prefix": value => $sf_volume_prefix;
"${name}/sf_svip": value => $sf_svip;
"${name}/sf_enable_volume_mapping": value => $sf_enable_volume_mapping;
"${name}/sf_enable_vag": value => $sf_enable_vag;
} }
create_resources('cinder_config', $extra_options) create_resources('cinder_config', $extra_options)

50
spec/classes/cinder_volume_solidfire_spec.rb
View File

@ -4,7 +4,7 @@ describe 'cinder::volume::solidfire' do
let :req_params do let :req_params do
{ {
:san_ip => '127.0.0.2', :san_ip => '127.0.0.2',
:san_login => 'solidfire', :san_login => 'solidfire_login',
:san_password => 'password', :san_password => 'password',
} }
end end
@ -13,25 +13,51 @@ describe 'cinder::volume::solidfire' do
req_params req_params
end end
describe 'solidfire volume driver' do shared_examples_for 'solidfire volume driver' do
it 'configure solidfire volume driver' do it 'configure solidfire volume driver' do
is_expected.to contain_cinder_config('DEFAULT/volume_driver').with_value('cinder.volume.drivers.solidfire.SolidFireDriver') is_expected.to contain_cinder_config('DEFAULT/volume_driver'
is_expected.to contain_cinder_config('DEFAULT/san_ip').with_value('127.0.0.2') ).with_value('cinder.volume.drivers.solidfire.SolidFireDriver')
is_expected.to contain_cinder_config('DEFAULT/san_login').with_value('solidfire') is_expected.to contain_cinder_config('DEFAULT/san_ip'
is_expected.to contain_cinder_config('DEFAULT/san_password').with_value('password') ).with_value('127.0.0.2')
is_expected.to contain_cinder_config('DEFAULT/sf_template_account_name').with_value('openstack-vtemplate') is_expected.to contain_cinder_config('DEFAULT/san_login'
is_expected.to contain_cinder_config('DEFAULT/sf_allow_template_caching').with_value('false') ).with_value('solidfire_login')
is_expected.to contain_cinder_config('DEFAULT/san_password'
).with_value('password')
is_expected.to contain_cinder_config('DEFAULT/sf_template_account_name'
).with_value('openstack-vtemplate')
is_expected.to contain_cinder_config('DEFAULT/sf_allow_template_caching'
).with_value(false)
is_expected.to contain_cinder_config('DEFAULT/volume_backend_name'
).with_value('solidfire')
is_expected.to contain_cinder_config('DEFAULT/sf_emulate_512'
).with_value(true)
is_expected.to contain_cinder_config('DEFAULT/sf_allow_tenant_qos'
).with_value(false)
is_expected.to contain_cinder_config('DEFAULT/sf_account_prefix'
).with_value('')
is_expected.to contain_cinder_config('DEFAULT/sf_api_port'
).with_value('443')
is_expected.to contain_cinder_config('DEFAULT/sf_volume_prefix'
).with_value('UUID-')
is_expected.to contain_cinder_config('DEFAULT/sf_svip'
).with_value('')
is_expected.to contain_cinder_config('DEFAULT/sf_enable_volume_mapping'
).with_value(true)
is_expected.to contain_cinder_config('DEFAULT/sf_enable_vag'
).with_value(false)
end end
it 'marks san_password as secret' do it 'marks san_password as secret' do
is_expected.to contain_cinder_config('DEFAULT/san_password').with_secret( true ) is_expected.to contain_cinder_config('DEFAULT/san_password'
).with_secret( true )
end end
end end
describe 'solidfire volume driver with additional configuration' do context 'with solidfire volume drivers additional configuration' do
before :each do before do
params.merge!({:extra_options => {'solidfire_backend/param1' => {'value' => 'value1'}}}) params.merge!({:extra_options => {'solidfire_backend/param1' =>
{ 'value' => 'value1' }}})
end end
it 'configure solidfire volume with additional configuration' do it 'configure solidfire volume with additional configuration' do

53
spec/defines/cinder_backend_solidfire_spec.rb
View File

@ -6,7 +6,7 @@ describe 'cinder::backend::solidfire' do
let :req_params do let :req_params do
{ {
:san_ip => '127.0.0.2', :san_ip => '127.0.0.2',
:san_login => 'solidfire', :san_login => 'solidfire_login',
:san_password => 'password', :san_password => 'password',
} }
end end
@ -17,24 +17,49 @@ describe 'cinder::backend::solidfire' do
describe 'solidfire volume driver' do describe 'solidfire volume driver' do
it 'configure solidfire volume driver' do it 'configure solidfire volume driver' do
is_expected.to contain_cinder_config('solidfire/volume_driver').with_value( is_expected.to contain_cinder_config('solidfire/volume_driver'
'cinder.volume.drivers.solidfire.SolidFireDriver') ).with_value('cinder.volume.drivers.solidfire.SolidFireDriver')
is_expected.to contain_cinder_config('solidfire/san_ip').with_value( is_expected.to contain_cinder_config('solidfire/san_ip'
'127.0.0.2') ).with_value('127.0.0.2')
is_expected.to contain_cinder_config('solidfire/san_login').with_value( is_expected.to contain_cinder_config('solidfire/san_login'
'solidfire') ).with_value('solidfire_login')
is_expected.to contain_cinder_config('solidfire/san_password').with_value( is_expected.to contain_cinder_config('solidfire/san_password'
'password') ).with_value('password')
is_expected.to contain_cinder_config('solidfire/sf_template_account_name').with_value( is_expected.to contain_cinder_config('solidfire/sf_template_account_name'
'openstack-vtemplate') ).with_value('openstack-vtemplate')
is_expected.to contain_cinder_config('solidfire/sf_allow_template_caching').with_value( is_expected.to contain_cinder_config('solidfire/sf_allow_template_caching'
'false') ).with_value(false)
is_expected.to contain_cinder_config('solidfire/volume_backend_name'
).with_value('solidfire')
is_expected.to contain_cinder_config('solidfire/sf_emulate_512'
).with_value(true)
is_expected.to contain_cinder_config('solidfire/sf_allow_tenant_qos'
).with_value(false)
is_expected.to contain_cinder_config('solidfire/sf_account_prefix'
).with_value('')
is_expected.to contain_cinder_config('solidfire/sf_api_port'
).with_value('443')
is_expected.to contain_cinder_config('solidfire/sf_volume_prefix'
).with_value('UUID-')
is_expected.to contain_cinder_config('solidfire/sf_svip'
).with_value('')
is_expected.to contain_cinder_config('solidfire/sf_enable_volume_mapping'
).with_value(true)
is_expected.to contain_cinder_config('solidfire/sf_enable_vag'
).with_value(false)
end end
it 'marks san_password as secret' do
is_expected.to contain_cinder_config('solidfire/san_password'
).with_secret( true )
end
end end
describe 'solidfire backend with additional configuration' do describe 'solidfire backend with additional configuration' do
before :each do before :each do
params.merge!({:extra_options => {'solidfire/param1' => {'value' => 'value1'}}}) params.merge!({:extra_options =>
{'solidfire/param1' => {'value' => 'value1'}}})
end end
it 'configure solidfire backend with additional configuration' do it 'configure solidfire backend with additional configuration' do