From: Andrew Schoen <aschoen@redhat.com>
Date: Thu, 5 May 2016 18:56:32 +0000 (-0500)
Subject: use the use_systemd fact when starting monitors
X-Git-Tag: ceph-ansible-1.0.5-33~53
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65c4f40d9384dc235d59022616f48f409cfdbcc7;p=ceph-ansible.git

use the use_systemd fact when starting monitors

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

diff --git a/roles/ceph-mon/tasks/start_monitor.yml b/roles/ceph-mon/tasks/start_monitor.yml
index 008a0e255..4383e072a 100644
--- a/roles/ceph-mon/tasks/start_monitor.yml
+++ b/roles/ceph-mon/tasks/start_monitor.yml
@@ -10,13 +10,13 @@
   with_items:
     - done
     - upstart
-  when: ansible_distribution == "Ubuntu"
+  when: not use_systemd
 
 - name: start and add that the monitor service to the init sequence (ubuntu)
   command: initctl emit ceph-mon cluster={{ cluster }} id={{ monitor_name }}
   changed_when: false
   failed_when: false
-  when: ansible_distribution == "Ubuntu"
+  when: not use_systemd
 
 # NOTE (leseb): somehow the service ansible module is messing things up
 # as a safety measure we run the raw command
@@ -35,7 +35,7 @@
   changed_when: false
   failed_when: false
   when:
-    ansible_distribution != "Ubuntu" and
+    use_systemd and
     is_after_hammer
 
 - name: start and add that the monitor service to the init sequence (for or after infernalis)
@@ -45,7 +45,7 @@
       enabled: yes
   changed_when: false
   when:
-    ansible_distribution != "Ubuntu" and
+    use_systemd and
     is_after_hammer
 
 - name: collect admin and bootstrap keys