Fix radosgw startup on RedHat systems

Fix startup and move vars to group_vars

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>

diff --git a/group_vars/all b/group_vars/all
index 6a3de3c995be5d8af0657fe4994138d2cc11692c..0a62d7bcbec37bc48a26cb47e39e19b669f21fd2 100644 (file)
--- a/group_vars/all
+++ b/group_vars/all
@@ -110,6 +110,8 @@ dummy:
 #
 #radosgw: false # referenced in monitor role too.
 #radosgw_dns_name: your.subdomain.tld # subdomains used by radosgw. See http://ceph.com/docs/master/radosgw/config/#enabling-subdomain-s3-calls
+#radosgw_frontend: civetweb # supported options are 'apache' or 'civetweb', also edit roles/ceph-radosgw/defaults/main.yml
+#radosgw_civetweb_port: 80
 
 ## REST API options
 #

diff --git a/roles/ceph-radosgw/tasks/start_radosgw.yml b/roles/ceph-radosgw/tasks/start_radosgw.yml
index 6c35995e286ee5fdb8e0e2f5499b11dfd5e94082..442072247a0039ce4c599a7d0165806af38e0ce0 100644 (file)
--- a/roles/ceph-radosgw/tasks/start_radosgw.yml
+++ b/roles/ceph-radosgw/tasks/start_radosgw.yml
@@ -5,10 +5,14 @@
   register: rgwstatus
   ignore_errors: True
 
+- name: start RGW
+  command: /etc/init.d/radosgw start
+  when: rgwstatus.rc != 0 and ansible_distribution != "Ubuntu" and ansible_os_family != 'RedHat'
+
 - name: start RGW
   service: name=radosgw-all state=started
   when: ansible_distribution == "Ubuntu"
 
 - name: start RGW
-  command: /etc/init.d/radosgw start
-  when: rgwstatus.rc != 0 and ansible_distribution != "Ubuntu"
+  service: name=ceph-radosgw state=started
+  when: ansible_os_family == 'RedHat'