common/docker-common: always start ntp

There is no need to only start ntp only if the package was present. If
the package is not present, we install it AND eventually activate + run
the service.

The original fix is part of this commit:
https://github.com/ceph/ceph-ansible/commit/849786967ac4c6235e624243019f0b54bf3340a4
However, this is a feature addition so it cannot be backported. Hence
this commit.

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
index 32050835e02235e7e04464a72f2cb24859cada13..92f93d5d423602e8272c67fd52387e391629efdd 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_ntp_atomic.yml
+++ b/roles/ceph-common/tasks/checks/check_ntp_atomic.yml
@@ -1,7 +1,6 @@
 ---
 - name: check ntp installation on atomic
   command: rpm -q chrony
-  register: ntp_pkg_query
   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 c666958ca5926a8534719c863e81a51915e3124c..65c9b6c3e12169992862c8df07ca91359fdebd34 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_ntp_debian.yml
+++ b/roles/ceph-common/tasks/checks/check_ntp_debian.yml
@@ -1,7 +1,6 @@
 ---
 - name: check ntp installation on debian
   command: dpkg -s ntp
-  register: ntp_pkg_query
   ignore_errors: true
   always_run: true
   changed_when: false

diff --git a/roles/ceph-common/tasks/checks/check_ntp_redhat.yml b/roles/ceph-common/tasks/checks/check_ntp_redhat.yml
index 2a957b4553a87dd8da66fc896ac372295e7251e2..32d9fbef6e4d6216673b25a8a26caca9c1094304 100644 (file)
--- a/roles/ceph-common/tasks/checks/check_ntp_redhat.yml
+++ b/roles/ceph-common/tasks/checks/check_ntp_redhat.yml
@@ -1,7 +1,6 @@
 ---
 - name: check ntp installation on redhat
   command: rpm -q ntp
-  register: ntp_pkg_query
   ignore_errors: true
   always_run: true
   changed_when: false

diff --git a/roles/ceph-common/tasks/misc/ntp_atomic.yml b/roles/ceph-common/tasks/misc/ntp_atomic.yml
index 4da8abe843815f84e9f08196f075220c473a54fe..09967a35ed12ff97c0ecbea08ec7e59a26b22fbf 100644 (file)
--- a/roles/ceph-common/tasks/misc/ntp_atomic.yml
+++ b/roles/ceph-common/tasks/misc/ntp_atomic.yml
@@ -9,5 +9,3 @@
     name: chronyd
     enabled: yes
     state: started
-  when:
-    - ntp_pkg_query.rc == 0

diff --git a/roles/ceph-common/tasks/misc/ntp_debian.yml b/roles/ceph-common/tasks/misc/ntp_debian.yml
index 7eab2e410fd448cc561f54b9363249d95e694864..c0d7ae61a4b0516a62e5d704ae307045f3720529 100644 (file)
--- a/roles/ceph-common/tasks/misc/ntp_debian.yml
+++ b/roles/ceph-common/tasks/misc/ntp_debian.yml
@@ -9,5 +9,3 @@
     name: ntp
     enabled: yes
     state: started
-  when:
-    - ntp_pkg_query.rc == 0

diff --git a/roles/ceph-common/tasks/misc/ntp_redhat.yml b/roles/ceph-common/tasks/misc/ntp_redhat.yml
index 332841b9c78f8b1317938f66a6fb4d43b2fae658..37e4ef1ab5da2311bbffadd463f99083102f0d89 100644 (file)
--- a/roles/ceph-common/tasks/misc/ntp_redhat.yml
+++ b/roles/ceph-common/tasks/misc/ntp_redhat.yml
@@ -9,5 +9,3 @@
     name: ntpd
     enabled: yes
     state: started
-  when:
-    - ntp_pkg_query.rc == 0

diff --git a/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml b/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml
index 32050835e02235e7e04464a72f2cb24859cada13..92f93d5d423602e8272c67fd52387e391629efdd 100644 (file)
--- a/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml
+++ b/roles/ceph-docker-common/tasks/checks/check_ntp_atomic.yml
@@ -1,7 +1,6 @@
 ---
 - name: check ntp installation on atomic
   command: rpm -q chrony
-  register: ntp_pkg_query
   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 c666958ca5926a8534719c863e81a51915e3124c..65c9b6c3e12169992862c8df07ca91359fdebd34 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,7 +1,6 @@
 ---
 - name: check ntp installation on debian
   command: dpkg -s ntp
-  register: ntp_pkg_query
   ignore_errors: true
   always_run: true
   changed_when: false

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 2a957b4553a87dd8da66fc896ac372295e7251e2..32d9fbef6e4d6216673b25a8a26caca9c1094304 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,7 +1,6 @@
 ---
 - name: check ntp installation on redhat
   command: rpm -q ntp
-  register: ntp_pkg_query
   ignore_errors: true
   always_run: true
   changed_when: false

diff --git a/roles/ceph-docker-common/tasks/misc/ntp_atomic.yml b/roles/ceph-docker-common/tasks/misc/ntp_atomic.yml
index b8a7534506777a872eda2e145628811bca029e9a..176c75a5f72558b844812f8aec9fcc9d77e8a2cf 100644 (file)
--- a/roles/ceph-docker-common/tasks/misc/ntp_atomic.yml
+++ b/roles/ceph-docker-common/tasks/misc/ntp_atomic.yml
@@ -8,5 +8,3 @@
     name: chronyd
     enabled: yes
     state: started
-  when:
-    - ntp_pkg_query.rc == 0

diff --git a/roles/ceph-docker-common/tasks/misc/ntp_debian.yml b/roles/ceph-docker-common/tasks/misc/ntp_debian.yml
index 7eab2e410fd448cc561f54b9363249d95e694864..c0d7ae61a4b0516a62e5d704ae307045f3720529 100644 (file)
--- a/roles/ceph-docker-common/tasks/misc/ntp_debian.yml
+++ b/roles/ceph-docker-common/tasks/misc/ntp_debian.yml
@@ -9,5 +9,3 @@
     name: ntp
     enabled: yes
     state: started
-  when:
-    - ntp_pkg_query.rc == 0

diff --git a/roles/ceph-docker-common/tasks/misc/ntp_redhat.yml b/roles/ceph-docker-common/tasks/misc/ntp_redhat.yml
index 332841b9c78f8b1317938f66a6fb4d43b2fae658..37e4ef1ab5da2311bbffadd463f99083102f0d89 100644 (file)
--- a/roles/ceph-docker-common/tasks/misc/ntp_redhat.yml
+++ b/roles/ceph-docker-common/tasks/misc/ntp_redhat.yml
@@ -9,5 +9,3 @@
     name: ntpd
     enabled: yes
     state: started
-  when:
-    - ntp_pkg_query.rc == 0