mirror of https://github.com/ceph/ceph-ansible.git
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 commitpull/3500/head v3.2.2488281187e
. Also please note that the commit488281187e
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 <ridave@redhat.com>
parent
416b503476
commit
4e94d11aa7
|
@ -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"
|
|
|
@ -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"
|
|
Loading…
Reference in New Issue