From f8e3d4bb760c1b5530b18232c71d3dad0fd93b2b Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 12 Oct 2017 15:36:14 +0100 Subject: [PATCH] ceph-docker-common: Add support for openSUSE Leap distributions Add support for the openSUSE Leap distributions. Signed-off-by: Markos Chandras --- roles/ceph-docker-common/meta/main.yml | 3 +++ .../checks/{check_ntp_redhat.yml => check_ntp_rpm.yml} | 6 +++--- roles/ceph-docker-common/tasks/main.yml | 6 +++--- .../tasks/misc/{ntp_redhat.yml => ntp_rpm.yml} | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) rename roles/ceph-docker-common/tasks/checks/{check_ntp_redhat.yml => check_ntp_rpm.yml} (58%) rename roles/ceph-docker-common/tasks/misc/{ntp_redhat.yml => ntp_rpm.yml} (52%) diff --git a/roles/ceph-docker-common/meta/main.yml b/roles/ceph-docker-common/meta/main.yml index 66e2d4b47..50c0ab699 100644 --- a/roles/ceph-docker-common/meta/main.yml +++ b/roles/ceph-docker-common/meta/main.yml @@ -11,6 +11,9 @@ galaxy_info: - name: EL versions: - 7 + - name: opensuse + versions: + - 42.3 categories: - system dependencies: [] diff --git a/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml b/roles/ceph-docker-common/tasks/checks/check_ntp_rpm.yml similarity index 58% rename from roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml rename to roles/ceph-docker-common/tasks/checks/check_ntp_rpm.yml index 6f22c4ada..59f6f8c8d 100644 --- a/roles/ceph-docker-common/tasks/checks/check_ntp_redhat.yml +++ b/roles/ceph-docker-common/tasks/checks/check_ntp_rpm.yml @@ -1,5 +1,5 @@ --- -- name: check ntp installation on redhat +- name: check ntp installation on redhat or suse command: rpm -q ntp args: warn: no @@ -8,9 +8,9 @@ check_mode: no changed_when: false when: - - ansible_os_family == 'RedHat' + - ansible_os_family in ['RedHat', 'Suse'] -- name: install ntp on redhat +- name: install ntp on redhat or suse package: name: ntp state: present diff --git a/roles/ceph-docker-common/tasks/main.yml b/roles/ceph-docker-common/tasks/main.yml index 195711107..12aac5d6c 100644 --- a/roles/ceph-docker-common/tasks/main.yml +++ b/roles/ceph-docker-common/tasks/main.yml @@ -75,11 +75,11 @@ - ansible_os_family == 'RedHat' - ntp_service_enabled -- name: include misc/ntp_redhat.yml - include: misc/ntp_redhat.yml +- name: include misc/ntp_rpm.yml + include: misc/ntp_rpm.yml when: - not is_atomic - - ansible_os_family == 'RedHat' + - ansible_os_family in ['RedHat', 'Suse'] - ntp_service_enabled - name: include misc/ntp_debian.yml diff --git a/roles/ceph-docker-common/tasks/misc/ntp_redhat.yml b/roles/ceph-docker-common/tasks/misc/ntp_rpm.yml similarity index 52% rename from roles/ceph-docker-common/tasks/misc/ntp_redhat.yml rename to roles/ceph-docker-common/tasks/misc/ntp_rpm.yml index 332841b9c..5384604eb 100644 --- a/roles/ceph-docker-common/tasks/misc/ntp_redhat.yml +++ b/roles/ceph-docker-common/tasks/misc/ntp_rpm.yml @@ -1,8 +1,8 @@ --- -- name: include ../checks/check_ntp_redhat.yml - include: ../checks/check_ntp_redhat.yml +- name: include ../checks/check_ntp_rpm.yml + include: ../checks/check_ntp_rpm.yml when: - - ansible_os_family == 'RedHat' + - ansible_os_family in ['RedHat', 'Suse'] - name: start the ntp service service: -- 2.39.5