From: Andrew Schoen <aschoen@redhat.com>
Date: Thu, 5 May 2016 19:31:12 +0000 (-0500)
Subject: Use the use_systemd fact when starting rgw
X-Git-Tag: ceph-ansible-1.0.5-33~51
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e125e37c273b1ca04b1f458a9fbbfd1be8db832f;p=ceph-ansible.git

Use the use_systemd fact when starting rgw

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 7436479c405f5054ac4a6b5535c299e7fceaad44)
---

diff --git a/roles/ceph-rgw/tasks/start_radosgw.yml b/roles/ceph-rgw/tasks/start_radosgw.yml
index c0689ff3b..b34ff26ef 100644
--- a/roles/ceph-rgw/tasks/start_radosgw.yml
+++ b/roles/ceph-rgw/tasks/start_radosgw.yml
@@ -10,13 +10,14 @@
   when:
     rgwstatus.rc != 0 and
     ansible_distribution != "Ubuntu" and
-    ansible_os_family != 'RedHat'
+    ansible_os_family != 'RedHat' and
+    not use_systemd
 
 - name: start and add that the rados gateway service to the init sequence (ubuntu)
   command: initctl emit radosgw cluster={{ cluster }} id=rgw.{{ ansible_hostname }}
   changed_when: false
   failed_when: false
-  when: ansible_distribution == 'Ubuntu'
+  when: not use_systemd
 
 - name: start rgw on red hat (before or on infernalis)
   service:
@@ -35,14 +36,14 @@
   changed_when: false
   failed_when: false
   when:
-    ansible_distribution != "Ubuntu" and
+    use_systemd and
     is_after_hammer
 
-- name: start rgw on red hat (after infernalis)
+- name: start rgw with systemd (for or after infernalis)
   service:
     name: ceph-radosgw@rgw.{{ ansible_hostname }}
     state: started
     enabled: yes
   when:
-    ansible_os_family == 'RedHat' and
+    use_systemd and
     is_after_hammer