From b39345751fb2fbcdbd53116f51916e5ebbaf3d21 Mon Sep 17 00:00:00 2001
From: Rishabh Dave <ridave@redhat.com>
Date: Wed, 12 Dec 2018 16:53:23 +0530
Subject: [PATCH] ceph-common: disable unrequired NTP services

When one of the currently supported NTP services has been set up,
disable rest of the NTP services on Ceph nodes.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1651875
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 6fa757d34358e90ae3a2f035b50d319193521ec5)
---
 roles/ceph-common/handlers/main.yml        | 21 +++++++++++++++++++++
 roles/ceph-common/tasks/misc/setup_ntp.yml |  9 +++++++++
 2 files changed, 30 insertions(+)

diff --git a/roles/ceph-common/handlers/main.yml b/roles/ceph-common/handlers/main.yml
index 5a9d52410..0478dd054 100644
--- a/roles/ceph-common/handlers/main.yml
+++ b/roles/ceph-common/handlers/main.yml
@@ -4,3 +4,24 @@
     name: firewalld
     state: restarted
     enabled: yes
+
+- name: disable ntpd
+  failed_when: false
+  service:
+    name: ntpd
+    state: stopped
+    enabled: no
+
+- name: disable chronyd
+  failed_when: false
+  service:
+    name: chronyd
+    enabled: no
+    state: stopped
+
+- name: disable timesyncd
+  failed_when: false
+  service:
+    name: timesyncd
+    enabled: no
+    state: stopped
diff --git a/roles/ceph-common/tasks/misc/setup_ntp.yml b/roles/ceph-common/tasks/misc/setup_ntp.yml
index b6a2ce34a..cb2a89aa5 100644
--- a/roles/ceph-common/tasks/misc/setup_ntp.yml
+++ b/roles/ceph-common/tasks/misc/setup_ntp.yml
@@ -15,6 +15,9 @@
     - name: install and enable timesyncd
       command: timedatectl set-ntp on
       when: ntp_daemon_type == "timesyncd"
+      notify:
+        - disable ntpd
+        - disable chronyd
 
     - name: disable time sync using timesyncd if we are not using it
       command: timedatectl set-ntp no
@@ -34,6 +37,9 @@
             name: "{{ ntp_service_name }}"
             enabled: yes
             state: started
+          notify:
+            - disable chronyd
+            - disable timesyncd
 
     - name: setup chronyd
       when: ntp_daemon_type == "chronyd"
@@ -49,3 +55,6 @@
             name: chronyd
             enabled: yes
             state: started
+          notify:
+            - disable chronyd
+            - disable timesyncd