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/group_vars/all.yml.sample b/group_vars/all.yml.sample
index c56ba8063f0570b9fbaf756483427607e2c66020..870c421ab9b4cd03d6d9edaf8d175e2371585b1e 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -56,20 +56,17 @@ dummy:
 #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/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index c3753cba8ad0952df4334b09861b7fa28f5bc7b6..7cdb24fcaf7d19b3219316b42cc68869986b2178 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/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/roles/ceph-common/tasks/checks/check_ntp_debian.yml b/roles/ceph-common/tasks/checks/check_ntp_debian.yml
index dc17abce0b14668389df871134a36ad3de274b5f..7da8f5bee725b70c30281c2f08807fb414768e72 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_ntp_debian.yml
+++ b/roles/ceph-common/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/roles/ceph-common/tasks/checks/check_ntp_redhat.yml b/roles/ceph-common/tasks/checks/check_ntp_redhat.yml
index 51f64400e00664a77869820f9038cd7f86331574..0e4772f5496eb9123cd35c13f634441062cefadb 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_ntp_redhat.yml
+++ b/roles/ceph-common/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