From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Tue, 28 Mar 2017 15:45:09 +0000 (+0200)
Subject: Common: Do not install ntp when ntp_service_enabled is false
X-Git-Tag: v2.2.10~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=837248e30def4d2681c9f4d4dfd29f8a5ea9ab23;p=ceph-ansible.git

Common: Do not install ntp when ntp_service_enabled is false

ntp is still installed even if ntp_service_enabled is set to false.
That could be a problem if the time synchronization is managed by
something else than ceph-ansible or if you want to use different NTP
implementation as suggested in #1354.

Fixes: #1354

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
Signed-off-by: Guits <gabrioux@redhat.com>
---

diff --git a/defaults/main.yml b/defaults/main.yml
index c3753cba8..7cdb24fca 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -48,20 +48,17 @@ upgrade_ceph_packages: False
 debian_package_dependencies:
   - python-pycurl
   - hdparm
-  - ntp
 
 centos_package_dependencies:
   - python-pycurl
   - hdparm
   - epel-release
-  - ntp
   - python-setuptools
   - libselinux-python
 
 redhat_package_dependencies:
   - python-pycurl
   - hdparm
-  - ntp
   - python-setuptools
 
 # Enable the ntp service by default to avoid clock skew on
diff --git a/tasks/checks/check_ntp_debian.yml b/tasks/checks/check_ntp_debian.yml
index dc17abce0..7da8f5bee 100644
--- a/tasks/checks/check_ntp_debian.yml
+++ b/tasks/checks/check_ntp_debian.yml
@@ -6,3 +6,8 @@
   always_run: true
   changed_when: false
   when: ansible_os_family == 'Debian'
+
+- name: install ntp on debian
+  package:
+    name: ntp
+    state: present
diff --git a/tasks/checks/check_ntp_redhat.yml b/tasks/checks/check_ntp_redhat.yml
index 51f64400e..0e4772f54 100644
--- a/tasks/checks/check_ntp_redhat.yml
+++ b/tasks/checks/check_ntp_redhat.yml
@@ -6,3 +6,8 @@
   always_run: true
   changed_when: false
   when: ansible_os_family == 'RedHat'
+
+- name: install ntp on redhat
+  package:
+    name: ntp
+    state: present