From 4e94d11aa738a0f5de3e84dc70d534fbe9c34c2f Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Wed, 9 Jan 2019 21:07:00 +0530 Subject: [PATCH] ceph-infra: remove ntp_rmp.yml and ntp_debian.yml This commit fixes the merge conflict that occurred during the auto-backport and auto-merge of the commit 488281187e8ac6c587db74961db9e075f31c8eae. Also please note that the commit 488281187e8ac6c587db74961db9e075f31c8eae was merged (on PR 3477) "as it is" (despite of merge conflicts) which was not supposed to be the case ideally. This had a side-effect that the feature of supporting multiple NTP daemons (new ones are namely chronyd and timesyncd) was also backported which is itself against the convention. For consistency's sake the feature was backported to stable-3.1 as well. Signed-off-by: Rishabh Dave --- roles/ceph-infra/tasks/ntp_debian.yml | 29 --------------------------- roles/ceph-infra/tasks/ntp_rpm.yml | 29 --------------------------- 2 files changed, 58 deletions(-) delete mode 100644 roles/ceph-infra/tasks/ntp_debian.yml delete mode 100644 roles/ceph-infra/tasks/ntp_rpm.yml diff --git a/roles/ceph-infra/tasks/ntp_debian.yml b/roles/ceph-infra/tasks/ntp_debian.yml deleted file mode 100644 index f1da045f1..000000000 --- a/roles/ceph-infra/tasks/ntp_debian.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- name: setup ntpd - block: - - command: timedatectl set-ntp no - - package: - name: ntp - state: present - - service: - name: ntp - enabled: yes - state: started - when: ntp_daemon_type == "ntpd" - -- name: setup chrony - block: - - command: timedatectl set-ntp no - - package: - name: chrony - state: present - - service: - name: chronyd - enabled: yes - state: started - when: ntp_daemon_type == "chronyd" - -- name: setup timesyncd - block: - - command: timedatectl set-ntp on - when: ntp_daemon_type == "timesyncd" diff --git a/roles/ceph-infra/tasks/ntp_rpm.yml b/roles/ceph-infra/tasks/ntp_rpm.yml deleted file mode 100644 index 866667c2b..000000000 --- a/roles/ceph-infra/tasks/ntp_rpm.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- name: setup ntpd - block: - - command: timedatectl set-ntp no - - package: - name: ntp - state: present - - service: - name: ntpd - enabled: yes - state: started - when: ntp_daemon_type == "ntpd" - -- name: setup chrony - block: - - command: timedatectl set-ntp no - - package: - name: chrony - state: present - - service: - name: chronyd - enabled: yes - state: started - when: ntp_daemon_type == "chronyd" - -- name: setup timesyncd - block: - - command: timedatectl set-ntp on - when: ntp_daemon_type == "timesyncd" -- 2.39.5