Move the ownership of /etc/ceph/ from radosgw.rb to conf.rb

This commit is contained in:
Craig Lewis 2013-08-01 13:19:41 -07:00
parent e3ceb7d27a
commit f88948a03e
2 changed files with 7 additions and 7 deletions

View File

@ -8,6 +8,13 @@ if node['roles'].include? 'ceph-radosgw'
is_rgw = true
end
directory "/etc/ceph" do
owner "root"
group "root"
mode "0644"
action :create
end
template '/etc/ceph/ceph.conf' do
source 'ceph.conf.erb'
variables(

View File

@ -48,13 +48,6 @@ unless File.exists?("/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}/done
include_recipe "ceph::radosgw_#{node["ceph"]["radosgw"]["webserver_companion"]}"
end
directory "/etc/ceph" do
owner "root"
group "root"
mode "0644"
action :create
end
ruby_block "create rados gateway client key" do
block do
keyring = %x[ ceph auth get-or-create client.radosgw.#{node['hostname']} osd 'allow rwx' mon 'allow r' --name mon. --key='#{node["ceph"]["monitor-secret"]}' ]