]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commit
ceph-infra: merge ntp_debian.yml and ntp_rpm.yml
authorRishabh Dave <ridave@redhat.com>
Wed, 12 Dec 2018 11:15:00 +0000 (16:45 +0530)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Fri, 4 Jan 2019 13:52:19 +0000 (13:52 +0000)
commit488281187e8ac6c587db74961db9e075f31c8eae
tree5ffe4fb91d22f7af94bf3363fcce1002da4a6a38
parent668c7a4db75590a8e40b63464dc4c325aae4eeb6
ceph-infra: merge ntp_debian.yml and ntp_rpm.yml

Merge ntp_debian.yml and ntp_rpm.yml into one (the new file is called
setup_ntp.yml) since they are almost identical. Also avoid repetition
of the common setup step for ntpd and chronyd services.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit b03ab607422eda0094d74223d52024a373b7ee9a)

# Conflicts:
# roles/ceph-infra/tasks/ntp_debian.yml
# roles/ceph-infra/tasks/ntp_rpm.yml
roles/ceph-infra/tasks/main.yml
roles/ceph-infra/tasks/setup_ntp.yml [new file with mode: 0644]