From 72e3ae44cc1e0ceb24b1e4664f273baa2529a1d8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ji=C5=99=C3=AD=20Suchomel?= <jsuchome@suse.cz>
Date: Wed, 24 Sep 2014 16:43:57 +0200
Subject: [PATCH] The 'done' file is only needed for upstart-based services.
 And chef recipe should be able to be run again even after configuration.

---
 recipes/radosgw.rb | 61 +++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/recipes/radosgw.rb b/recipes/radosgw.rb
index ee9b11a..0a5bb0d 100644
--- a/recipes/radosgw.rb
+++ b/recipes/radosgw.rb
@@ -42,42 +42,41 @@ directory '/var/run/ceph-radosgw' do
   action :create
 end
 
-if !::File.exist?("/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}/done")
-  if node['ceph']['radosgw']['webserver_companion']
-    include_recipe "ceph::radosgw_#{node['ceph']['radosgw']['webserver_companion']}"
-  end
+if node['ceph']['radosgw']['webserver_companion']
+  include_recipe "ceph::radosgw_#{node['ceph']['radosgw']['webserver_companion']}"
+end
 
-  ceph_client 'radosgw' do
-    caps('mon' => 'allow rw', 'osd' => 'allow rwx')
-    owner 'root'
-    group node['apache']['group']
-    mode 0640
-  end
+ceph_client 'radosgw' do
+  caps('mon' => 'allow rw', 'osd' => 'allow rwx')
+  owner 'root'
+  group node['apache']['group']
+  mode 0640
+end
 
-  directory "/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}" do
-    recursive true
-  end
+directory "/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}" do
+  recursive true
+  only_if { node['platform'] == 'ubuntu' }
+end
 
-  file "/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}/done" do
-    action :create
-  end
+# needed by https://github.com/ceph/ceph/blob/master/src/upstart/radosgw-all-starter.conf
+file "/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}/done" do
+  action :create
+  only_if { node['platform'] == 'ubuntu' }
+end
 
-  service 'radosgw' do
-    case node['ceph']['radosgw']['init_style']
-    when 'upstart'
-      service_name 'radosgw-all-starter'
-      provider Chef::Provider::Service::Upstart
+service 'radosgw' do
+  case node['ceph']['radosgw']['init_style']
+  when 'upstart'
+    service_name 'radosgw-all-starter'
+    provider Chef::Provider::Service::Upstart
+  else
+    if node['platform'] == 'debian'
+      service_name 'radosgw'
     else
-      if node['platform'] == 'debian'
-        service_name 'radosgw'
-      else
-        service_name 'ceph-radosgw'
-      end
+      service_name 'ceph-radosgw'
     end
-    supports :restart => true
-    action [:enable, :start]
-    subscribes :restart, 'template[/etc/ceph/ceph.conf]'
   end
-else
-  Log.info('Rados Gateway already deployed')
+  supports :restart => true
+  action [:enable, :start]
+  subscribes :restart, 'template[/etc/ceph/ceph.conf]'
 end
-- 
2.47.3