Creates the radosgw sentinel directory differently

Instead of relying on the radosgw_apache recipe,
just make it in the main radosgw recipe

diff --git a/recipes/radosgw.rb b/recipes/radosgw.rb
index 7fb59032b7975036ffc31846a7608c472bd6b618..f533d1891d8aeaa13594611977c6d816349690dd 100644 (file)
--- a/recipes/radosgw.rb
+++ b/recipes/radosgw.rb
@@ -32,6 +32,10 @@ if !::File.exist?("/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}/done")
     caps('mon' => 'allow rw', 'osd' => 'allow rwx')
   end
 
+  directory "/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}" do
+    recursive true
+  end
+
   file "/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}/done" do
     action :create
   end

diff --git a/recipes/radosgw_apache2.rb b/recipes/radosgw_apache2.rb
index d060606877bb9c558e861ec2c65eeb458652b745..9f23e51ae0d4bc0e825fe4eacc67fe703d74aae1 100644 (file)
--- a/recipes/radosgw_apache2.rb
+++ b/recipes/radosgw_apache2.rb
@@ -41,8 +41,6 @@
 #   end
 # end
 
-directory "/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}"
-
 include_recipe 'ceph::_common'
 include_recipe 'ceph::_common_install'
 include_recipe 'ceph::radosgw_apache2_repo'