From 7469d8fc1ccfefb1f2dd0610799fb4729636ceb3 Mon Sep 17 00:00:00 2001 From: luyuan Date: Tue, 12 Jan 2016 19:26:25 +0800 Subject: [PATCH] Fix wrong location for lock_path of params Change-Id: Ibcecafdd9a9fcf14a3f5fe072e6cb31ab0d0916b Closes-Bug: #1533161 --- manifests/init.pp | 2 +- spec/classes/cinder_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 91b1489f..69c0164f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -407,7 +407,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; + 'oslo_concurrency/lock_path': value => $lock_path; } } diff --git a/spec/classes/cinder_spec.rb b/spec/classes/cinder_spec.rb index b1201816..154f6d9d 100644 --- a/spec/classes/cinder_spec.rb +++ b/spec/classes/cinder_spec.rb @@ -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/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/lock_path').with(:value => '/var/lock/cinder') + is_expected.to contain_cinder_config('oslo_concurrency/lock_path').with(:value => '/var/lock/cinder') end end @@ -142,7 +142,7 @@ describe 'cinder' do 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') } + it { is_expected.to contain_cinder_config('oslo_concurrency/lock_path').with_value('/var/run/cinder.locks') } end describe 'with amqp_durable_queues disabled' do