docker-common: remove legacy tasks for ntp configuration

Those tasks aren't needed in docker-common since the introduction of
`ceph-infra` role. They are duplicated tasks.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/3325/head
Guillaume Abrioux 2018-10-19 15:57:18 +02:00 committed by Sébastien Han
parent 2bcaf9088b
commit cd0195c562
7 changed files with 0 additions and 97 deletions

View File

@ -1,9 +0,0 @@
---
- name: check ntp installation on atomic
command: rpm -q chrony
args:
warn: no
register: ntp_pkg_query
ignore_errors: true
check_mode: no
changed_when: false

View File

@ -1,14 +0,0 @@
---
- name: check ntp installation on debian
command: dpkg -s ntp
register: ntp_pkg_query
ignore_errors: true
check_mode: no
changed_when: false
when:
- ansible_os_family == 'Debian'
- name: install ntp on debian
package:
name: ntp
state: present

View File

@ -1,16 +0,0 @@
---
- name: check ntp installation on redhat or suse
command: rpm -q ntp
args:
warn: no
register: ntp_pkg_query
ignore_errors: true
check_mode: no
changed_when: false
when:
- ansible_os_family in ['RedHat', 'Suse']
- name: install ntp on redhat or suse
package:
name: ntp
state: present

View File

@ -30,26 +30,6 @@
- not ceph_current_status.get('rc', 1) == 0
- not rolling_update | default(false)
- name: include misc/ntp_atomic.yml
include_tasks: misc/ntp_atomic.yml
when:
- is_atomic
- ansible_os_family == 'RedHat'
- ntp_service_enabled
- name: include misc/ntp_rpm.yml
include_tasks: misc/ntp_rpm.yml
when:
- not is_atomic
- ansible_os_family in ['RedHat', 'Suse']
- ntp_service_enabled
- name: include misc/ntp_debian.yml
include_tasks: misc/ntp_debian.yml
when:
- ansible_os_family == 'Debian'
- ntp_service_enabled
- name: include fetch_image.yml
include_tasks: fetch_image.yml
tags:

View File

@ -1,12 +0,0 @@
---
- name: include ../checks/check_ntp_atomic.yml
include_tasks: ../checks/check_ntp_atomic.yml
when: is_atomic
- name: start the ntp service
service:
name: chronyd
enabled: yes
state: started
when:
- ntp_pkg_query.rc == 0

View File

@ -1,13 +0,0 @@
---
- name: include ../checks/check_ntp_debian.yml
include_tasks: ../checks/check_ntp_debian.yml
when:
- ansible_os_family == 'Debian'
- name: start the ntp service
service:
name: ntp
enabled: yes
state: started
when:
- ntp_pkg_query.rc == 0

View File

@ -1,13 +0,0 @@
---
- name: include ../checks/check_ntp_rpm.yml
include_tasks: ../checks/check_ntp_rpm.yml
when:
- ansible_os_family in ['RedHat', 'Suse']
- name: start the ntp service
service:
name: ntpd
enabled: yes
state: started
when:
- ntp_pkg_query.rc == 0