Merge pull request #2031 from major/simplify-ntp

Simplify NTP checks/install

roles/ceph-common/tasks/checks/check_ntp_atomic.yml

@@ -1,10 +0,0 @@
----
-- name: check ntp installation on atomic
-  command: rpm -q chrony
-  args:
-    warn: no
-  register: ntp_pkg_query
-  ignore_errors: true
-  changed_when: false
-  tags:
-    - always

roles/ceph-common/tasks/checks/check_ntp_debian.yml

@@ -1,15 +0,0 @@
----
-- name: check ntp installation on debian
-  command: dpkg -s ntp
-  register: ntp_pkg_query
-  ignore_errors: true
-  changed_when: false
-  when:
-    - ansible_os_family == 'Debian'
-  tags:
-    - always
-
-- name: install ntp on debian
-  package:
-    name: ntp
-    state: present

roles/ceph-common/tasks/checks/check_ntp_redhat.yml

@@ -1,17 +0,0 @@
----
-- name: check ntp installation on redhat
-  command: rpm -q ntp
-  args:
-    warn: no
-  register: ntp_pkg_query
-  ignore_errors: true
-  changed_when: false
-  when:
-    - ansible_os_family == 'RedHat'
-  tags:
-    - always
-
-- name: install ntp on redhat
-  package:
-    name: ntp
-    state: present

roles/ceph-common/tasks/main.yml

@@ -46,18 +46,10 @@
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
-- name: include misc/ntp_redhat.yml
+- name: include ntp setup tasks
-  include: misc/ntp_redhat.yml
+  include: "misc/ntp_{{ ansible_os_family | lower }}.yml"
   when:
-    - ansible_os_family == 'RedHat'
+    - ansible_os_family in ['RedHat', 'Debian']
-    - ntp_service_enabled
-  # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
-  static: False
-
-- name: include misc/ntp_debian.yml
-  include: misc/ntp_debian.yml
-  when:
-    - ansible_os_family == 'Debian'
     - ntp_service_enabled
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False

roles/ceph-common/tasks/misc/ntp_atomic.yml

@@ -1,13 +0,0 @@
----
-- name: include ../checks/check_ntp_atomic.yml
-  include: ../checks/check_ntp_atomic.yml
-  when:
-    - is_atomic
-
-- name: start the ntp service
-  service:
-    name: chronyd
-    enabled: yes
-    state: started
-  when:
-    - ntp_pkg_query.rc == 0

roles/ceph-common/tasks/misc/ntp_debian.yml

@@ -1,13 +1,11 @@
 ---
-- name: include ../checks/check_ntp_debian.yml
+- name: install ntp on debian
-  include: ../checks/check_ntp_debian.yml
+  package:
-  when:
+    name: ntp
-    - ansible_os_family == 'Debian'
+    state: present
 
 - name: start the ntp service
   service:
     name: ntp
     enabled: yes
     state: started
-  when:
-    - ntp_pkg_query.rc == 0

roles/ceph-common/tasks/misc/ntp_redhat.yml

@@ -1,13 +1,11 @@
 ---
-- name: include ../checks/check_ntp_redhat.yml
+- name: install ntp on redhat
-  include: ../checks/check_ntp_redhat.yml
+  package:
-  when:
+    name: ntp
-    - ansible_os_family == 'RedHat'
+    state: present
 
 - name: start the ntp service
   service:
     name: ntpd
     enabled: yes
     state: started
-  when:
-    - ntp_pkg_query.rc == 0