From: Walter  Huf <walter.huf@corvisa.com>
Date: Wed, 28 May 2014 20:55:22 +0000 (-0500)
Subject: Creates the radosgw sentinel directory differently
X-Git-Tag: v0.8.0~34^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F129%2Fhead;p=ceph-cookbooks.git

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 7fb5903..f533d18 100644
--- 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 d060606..9f23e51 100644
--- 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'