ntp: followup cleanup

Checking if ntp is present is not needed anymore, these tasks are not
used anymore. So let's remove them

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/roles/ceph-common/tasks/checks/check_ntp_atomic.yml b/roles/ceph-common/tasks/checks/check_ntp_atomic.yml
deleted file mode 100644 (file)
index 92f93d5..0000000
--- a/roles/ceph-common/tasks/checks/check_ntp_atomic.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: check ntp installation on atomic
-  command: rpm -q chrony
-  ignore_errors: true
-  always_run: true
-  changed_when: false

diff --git a/roles/ceph-common/tasks/checks/check_ntp_debian.yml b/roles/ceph-common/tasks/checks/check_ntp_debian.yml
index 65c9b6c3e12169992862c8df07ca91359fdebd34..8e8ae47035b893d10ee96836e0801768aedfb176 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_ntp_debian.yml
+++ b/roles/ceph-common/tasks/checks/check_ntp_debian.yml
@@ -1,12 +1,4 @@
 ---
-- name: check ntp installation on debian
-  command: dpkg -s ntp
-  ignore_errors: true
-  always_run: true
-  changed_when: false
-  when:
-    - ansible_os_family == 'Debian'
-
 - name: install ntp on debian
   package:
     name: ntp

diff --git a/roles/ceph-common/tasks/checks/check_ntp_redhat.yml b/roles/ceph-common/tasks/checks/check_ntp_redhat.yml
index 32d9fbef6e4d6216673b25a8a26caca9c1094304..c3e5f2f266b8ed93efa1004646970821b1ec99aa 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_ntp_redhat.yml
+++ b/roles/ceph-common/tasks/checks/check_ntp_redhat.yml
@@ -1,12 +1,4 @@
 ---
-- name: check ntp installation on redhat
-  command: rpm -q ntp
-  ignore_errors: true
-  always_run: true
-  changed_when: false
-  when:
-    - ansible_os_family == 'RedHat'
-
 - name: install ntp on redhat
   package:
     name: ntp

diff --git a/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml b/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml
deleted file mode 100644 (file)
index 92f93d5..0000000
--- a/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: check ntp installation on atomic
-  command: rpm -q chrony
-  ignore_errors: true
-  always_run: true
-  changed_when: false

diff --git a/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml b/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml
index 65c9b6c3e12169992862c8df07ca91359fdebd34..8e8ae47035b893d10ee96836e0801768aedfb176 100644 (file)
--- a/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml
+++ b/roles/ceph-docker-common/tasks/checks/check_ntp_debian.yml
@@ -1,12 +1,4 @@
 ---
-- name: check ntp installation on debian
-  command: dpkg -s ntp
-  ignore_errors: true
-  always_run: true
-  changed_when: false
-  when:
-    - ansible_os_family == 'Debian'
-
 - name: install ntp on debian
   package:
     name: ntp

diff --git a/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml b/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml
index 32d9fbef6e4d6216673b25a8a26caca9c1094304..c3e5f2f266b8ed93efa1004646970821b1ec99aa 100644 (file)
--- a/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml
+++ b/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml
@@ -1,12 +1,4 @@
 ---
-- name: check ntp installation on redhat
-  command: rpm -q ntp
-  ignore_errors: true
-  always_run: true
-  changed_when: false
-  when:
-    - ansible_os_family == 'RedHat'
-
 - name: install ntp on redhat
   package:
     name: ntp

diff --git a/roles/ceph-docker-common/tasks/misc/ntp_atomic.yml b/roles/ceph-docker-common/tasks/misc/ntp_atomic.yml
index 176c75a5f72558b844812f8aec9fcc9d77e8a2cf..40d1232bd4555c2122354f0f9456f78bf1e21708 100644 (file)
--- a/roles/ceph-docker-common/tasks/misc/ntp_atomic.yml
+++ b/roles/ceph-docker-common/tasks/misc/ntp_atomic.yml
@@ -1,8 +1,4 @@
 ---
-- name: include ../checks/check_ntp_atomic.yml
-  include: ../checks/check_ntp_atomic.yml
-  when: is_atomic
-
 - name: start the ntp service
   service:
     name: chronyd