Merge pull request #1399 from guits/fix_ntp_install

Common: Do not install ntp when ntp_service_enabled is false

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

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

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

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