Add directory creation for /etc/cinder
Ensure /etc/cinder exists before trying to create /etc/cinder/cinder.conf fixes lp 1197930 Change-Id: I372603b56f0e4fd284f65f29b6260bb3c53289b8
This commit is contained in:
parent
3edd2feeba
commit
0e25355340
|
@ -1 +1,3 @@
|
|||
.bundle/
|
||||
.berkshelf
|
||||
.kitchen
|
||||
|
|
|
@ -63,6 +63,9 @@
|
|||
},
|
||||
"selinux": {
|
||||
"locked_version": "0.5.6"
|
||||
},
|
||||
"iptables": {
|
||||
"locked_version": "0.12.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -35,6 +35,13 @@ rabbit_vhost = node["openstack"]["block-storage"]["rabbit"]["vhost"]
|
|||
|
||||
glance_api_endpoint = endpoint "image-api"
|
||||
|
||||
directory "/etc/cinder" do
|
||||
group node["openstack"]["block-storage"]["group"]
|
||||
owner node["openstack"]["block-storage"]["user"]
|
||||
mode 00750
|
||||
action :create
|
||||
end
|
||||
|
||||
template "/etc/cinder/cinder.conf" do
|
||||
source "cinder.conf.erb"
|
||||
group node["openstack"]["block-storage"]["group"]
|
||||
|
|
|
@ -9,6 +9,20 @@ describe "openstack-block-storage::cinder-common" do
|
|||
@chef_run.converge "openstack-block-storage::cinder-common"
|
||||
end
|
||||
|
||||
describe "/etc/cinder" do
|
||||
before do
|
||||
@dir = @chef_run.directory "/etc/cinder"
|
||||
end
|
||||
|
||||
it "has proper owner" do
|
||||
expect(@dir).to be_owned_by "cinder", "cinder"
|
||||
end
|
||||
|
||||
it "has proper modes" do
|
||||
expect(sprintf("%o", @dir.mode)).to eq "750"
|
||||
end
|
||||
end
|
||||
|
||||
describe "cinder.conf" do
|
||||
before do
|
||||
@file = @chef_run.template "/etc/cinder/cinder.conf"
|
||||
|
|
Loading…
Reference in New Issue