openstack/puppet-cinder
Code Issues Proposed changes

Merge "Add lock_path to cinder config"

Browse Source
This commit is contained in:
Jenkins 2015-08-06 06:20:39 +00:00 committed by Gerrit Code Review
commit 6796a75d5a
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/init.pp
View File

@ -221,6 +221,11 @@
# (Optional) Whether to enable the v1 API (true/false).
# Defaults to 'true'.
#
# [*lock_path*]
# (optional) Where to store lock files. This directory must be writeable
# by the user executing the agent
# Defaults to: /var/lock/cinder
#
# === Deprecated Parameters
#
# [*mysql_module*]
@ -279,6 +284,7 @@ class cinder (
$default_availability_zone = false,
$enable_v1_api = true,
$enable_v2_api = true,
$lock_path = '/var/lock/cinder',
# DEPRECATED PARAMETERS
$mysql_module = undef,
) {
@ -509,6 +515,7 @@ class cinder (
cinder_config {
'DEFAULT/enable_v1_api': value => $enable_v1_api;
'DEFAULT/enable_v2_api': value => $enable_v2_api;
'DEFAULT/lock_path': value => $lock_path;
}
}

6
spec/classes/cinder_spec.rb
View File

@ -41,6 +41,7 @@ describe 'cinder' do
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/log_dir').with(:value => '/var/log/cinder')
is_expected.to contain_cinder_config('DEFAULT/lock_path').with(:value => '/var/lock/cinder')
end
end
@ -238,6 +239,11 @@ describe 'cinder' do
it { is_expected.to contain_cinder_config('DEFAULT/log_dir').with_ensure('absent') }
end
describe 'with different lock_path' do
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') }
end
describe 'with amqp_durable_queues disabled' do
let :params do
req_params