openstack/puppet-cinder
Code Issues Proposed changes

Merge "Fix wrong location for lock_path of params"

Browse Source
This commit is contained in:
Jenkins 2016-01-13 21:21:50 +00:00 committed by Gerrit Code Review
commit 296dbfd514
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -407,7 +407,7 @@ class cinder (
cinder_config { cinder_config {
'DEFAULT/enable_v1_api': value => $enable_v1_api; 'DEFAULT/enable_v1_api': value => $enable_v1_api;
'DEFAULT/enable_v2_api': value => $enable_v2_api; 'DEFAULT/enable_v2_api': value => $enable_v2_api;
'DEFAULT/lock_path': value => $lock_path; 'oslo_concurrency/lock_path': value => $lock_path;
} }
} }

4
spec/classes/cinder_spec.rb
View File

@ -43,7 +43,7 @@ describe 'cinder' do
is_expected.to contain_cinder_config('DEFAULT/storage_availability_zone').with(:value => 'nova') is_expected.to contain_cinder_config('DEFAULT/storage_availability_zone').with(:value => 'nova')
is_expected.to contain_cinder_config('DEFAULT/default_availability_zone').with(:value => 'nova') is_expected.to contain_cinder_config('DEFAULT/default_availability_zone').with(:value => 'nova')
is_expected.to contain_cinder_config('DEFAULT/api_paste_config').with(:value => '/etc/cinder/api-paste.ini') is_expected.to contain_cinder_config('DEFAULT/api_paste_config').with(:value => '/etc/cinder/api-paste.ini')
is_expected.to contain_cinder_config('DEFAULT/lock_path').with(:value => '/var/lock/cinder') is_expected.to contain_cinder_config('oslo_concurrency/lock_path').with(:value => '/var/lock/cinder')
end end
end end
@ -142,7 +142,7 @@ describe 'cinder' do
describe 'with different lock_path' do describe 'with different lock_path' do
let(:params) { req_params.merge!({:lock_path => '/var/run/cinder.locks'}) } let(:params) { req_params.merge!({:lock_path => '/var/run/cinder.locks'}) }
it { is_expected.to contain_cinder_config('DEFAULT/lock_path').with_value('/var/run/cinder.locks') } it { is_expected.to contain_cinder_config('oslo_concurrency/lock_path').with_value('/var/run/cinder.locks') }
end end
describe 'with amqp_durable_queues disabled' do describe 'with amqp_durable_queues disabled' do