From: Rishabh Dave <ridave@redhat.com>
Date: Thu, 1 Nov 2018 13:46:03 +0000 (+0530)
Subject: remove task named "include ntp debian setup tasks"
X-Git-Tag: v4.0.0beta1~270
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed1d53b2f8a61b62c47795c90fe64b9bb9de7cc0;p=ceph-ansible.git

remove task named "include ntp debian setup tasks"

The task was included by mistake while resolving a merge confict for
commit 8edbda96df6896d51703fcc250f562abb4011a2d. The task removed in
commit b3a71eeb08e9cdb2607ed60d724f387a0a24d3de.

Fixes: https://github.com/ceph/ceph-ansible/issues/3292
Signed-off-by: Rishabh Dave <ridave@redhat.com>
---

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 1e1a1e7cf..a5fb94891 100644
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -11,16 +11,10 @@
   tags:
     - package-install
 
-- name: debian based systems tasks
-  block:
-    - name: include installs/install_on_debian.yml
-      include_tasks: installs/install_on_debian.yml
-      tags:
-        - package-install
-    - name: include ntp debian setup tasks
-      include_tasks: "misc/ntp_debian.yml"
-      when:
-        - ntp_service_enabled
+- name: include installs/install_on_debian.yml
+  include_tasks: installs/install_on_debian.yml
+  tags:
+    - package-install
   when:
     - ansible_os_family == 'Debian'