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

diff --git a/recipes/conf.rb b/recipes/conf.rb
index 648061179d40cc1d4027d11b113c31cfde1ee043..a15a2a4a5b36bae7afe2233f808fe26da226df4a 100644 (file)
--- a/recipes/conf.rb
+++ b/recipes/conf.rb
@@ -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(

diff --git a/recipes/radosgw.rb b/recipes/radosgw.rb
index 7447364fd5b60e2d28d9a3509c8b07e7457b2e64..d15d98db85912686a25e58c2140c7e89b3021a60 100644 (file)
--- a/recipes/radosgw.rb
+++ b/recipes/radosgw.rb
@@ -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"]}' ]