summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorMark Vanderwiel <vanderwl@us.ibm.com>2015-04-28 14:18:52 -0500
committerMark Vanderwiel <vanderwl@us.ibm.com>2015-04-28 14:18:52 -0500
commit6f44d7163110c4910e112db576a7e49ca22a6018 (patch)
tree8d4b651cb49380c26c67e8909074996dfd917530 /spec
parent226d27a12db4c347991080cec55d410edbc3a67a (diff)
Fix lock_path to be based upon state path
On some recent platforms, systemd based, the /var/lock/ path gets cleaned up at reboot and causes issues for projects like cinder. Nova and neutron changed long ago to base the lock path off the state path, this change does the same thing now for cinder. Change-Id: Ibe693c21cfc63dd5b6e1753c85081a952005b293 Closes-Bug: #1449711
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Ma Wen Cheng <wenchma@cn.ibm.com> Workflow+1: Ma Wen Cheng <wenchma@cn.ibm.com> Code-Review+2: JJ Asghar <jj@getchef.com> Submitted-by: Jenkins Submitted-at: Wed, 29 Apr 2015 03:20:45 +0000 Reviewed-on: https://review.openstack.org/178351 Project: stackforge/cookbook-openstack-block-storage Branch: refs/heads/master
Diffstat (limited to 'spec')
-rw-r--r--spec/cinder_common_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb
index 9d0c96e..51e9d2a 100644
--- a/spec/cinder_common_spec.rb
+++ b/spec/cinder_common_spec.rb
@@ -193,7 +193,7 @@ describe 'openstack-block-storage::cinder-common' do
193 end 193 end
194 194
195 it 'has a lock_path attribute' do 195 it 'has a lock_path attribute' do
196 expect(chef_run).to render_config_file(file.name).with_section_content('oslo_concurrency', %r(^lock_path=/var/lock/cinder$)) 196 expect(chef_run).to render_config_file(file.name).with_section_content('oslo_concurrency', %r(^lock_path=/var/lib/cinder/lock$))
197 end 197 end
198 198
199 context 'netapp driver' do 199 context 'netapp driver' do
@@ -971,10 +971,10 @@ describe 'openstack-block-storage::cinder-common' do
971 end 971 end
972 end 972 end
973 973
974 describe '/var/lock/cinder' do 974 describe '/var/lib/cinder/lock' do
975 let(:dir) { chef_run.directory('/var/lock/cinder') } 975 let(:dir) { chef_run.directory('/var/lib/cinder/lock') }
976 976
977 it 'should create the /var/lock/cinder directory' do 977 it 'should create the /var/lib/cinder/lock directory' do
978 expect(chef_run).to create_directory(dir.name) 978 expect(chef_run).to create_directory(dir.name)
979 end 979 end
980 980
@@ -984,7 +984,7 @@ describe 'openstack-block-storage::cinder-common' do
984 end 984 end
985 985
986 it 'has proper modes' do 986 it 'has proper modes' do
987 expect(sprintf('%o', dir.mode)).to eq '700' 987 expect(sprintf('%o', dir.mode)).to eq '755'
988 end 988 end
989 end 989 end
990 990