From 8e3511ddc7c20b8a011664a1a258a33b2f9a94dd Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Wed, 21 Aug 2019 18:17:00 +0200 Subject: [PATCH] fix SUSE/openSUSE naming As SUSE 15.x and openSUSE Leap 15.x share the same base, make clear that both are targeted by the respective tasks Signed-off-by: Johannes Kastl --- raw_install_python.yml | 6 +++--- roles/ceph-common/tasks/installs/install_on_suse.yml | 4 ++-- roles/ceph-common/tasks/installs/install_suse_packages.yml | 6 +++--- roles/ceph-infra/tasks/configure_firewall.yml | 2 +- roles/ceph-mds/tasks/non_containerized.yml | 2 +- roles/ceph-nfs/tasks/pre_requisite_non_container.yml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/raw_install_python.yml b/raw_install_python.yml index d7f3a854e..e14c0b525 100644 --- a/raw_install_python.yml +++ b/raw_install_python.yml @@ -28,7 +28,7 @@ failed_when: false register: stat_apt - - name: check for zypper package manager (OpenSUSE) + - name: check for zypper package manager (SUSE/OpenSUSE) raw: stat /usr/bin/zypper changed_when: false failed_when: false @@ -49,9 +49,9 @@ until: result is succeeded when: stat_apt.rc == 0 - - name: install python for opensuse + - name: install python for SUSE/OpenSUSE raw: zypper -n install python-base register: result until: result is succeeded when: stat_zypper.rc == 0 - when: not True in (systempython.results | selectattr('stat', 'defined') | map(attribute='stat.exists') | list | unique) \ No newline at end of file + when: not True in (systempython.results | selectattr('stat', 'defined') | map(attribute='stat.exists') | list | unique) diff --git a/roles/ceph-common/tasks/installs/install_on_suse.yml b/roles/ceph-common/tasks/installs/install_on_suse.yml index e572b65dd..8a682bda1 100644 --- a/roles/ceph-common/tasks/installs/install_on_suse.yml +++ b/roles/ceph-common/tasks/installs/install_on_suse.yml @@ -1,8 +1,8 @@ --- -# SUSE only supports the following: +# SUSE/openSUSE only supports the following: # - ceph_origin == 'distro' # - ceph_origin == 'repository' and ceph_repository == 'obs' -- name: Check for supported installation method on suse +- name: Check for supported installation method on SUSE/openSUSE fail: msg: "Unsupported installation method origin:{{ ceph_origin }} repo:{{ ceph_repository }}'" when: ceph_origin != 'distro' or (ceph_origin == 'repository' and ceph_repository != 'obs') diff --git a/roles/ceph-common/tasks/installs/install_suse_packages.yml b/roles/ceph-common/tasks/installs/install_suse_packages.yml index f7a4593a8..5c5566faf 100644 --- a/roles/ceph-common/tasks/installs/install_suse_packages.yml +++ b/roles/ceph-common/tasks/installs/install_suse_packages.yml @@ -1,14 +1,14 @@ --- -- name: install suse dependencies +- name: install SUSE/openSUSE dependencies package: name: "{{ suse_package_dependencies }}" state: present register: result until: result is succeeded -- name: install suse ceph packages +- name: install SUSE/openSUSE ceph packages package: name: "{{ suse_ceph_pkgs | unique }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" register: result - until: result is succeeded \ No newline at end of file + until: result is succeeded diff --git a/roles/ceph-infra/tasks/configure_firewall.yml b/roles/ceph-infra/tasks/configure_firewall.yml index 64aedbcf2..bce409445 100644 --- a/roles/ceph-infra/tasks/configure_firewall.yml +++ b/roles/ceph-infra/tasks/configure_firewall.yml @@ -1,5 +1,5 @@ --- -- name: check firewalld installation on redhat or suse +- name: check firewalld installation on redhat or SUSE/openSUSE command: rpm -q firewalld args: warn: no diff --git a/roles/ceph-mds/tasks/non_containerized.yml b/roles/ceph-mds/tasks/non_containerized.yml index 6f8f15a61..a4400172a 100644 --- a/roles/ceph-mds/tasks/non_containerized.yml +++ b/roles/ceph-mds/tasks/non_containerized.yml @@ -10,7 +10,7 @@ register: result until: result is succeeded -- name: install ceph-mds package on redhat or suse +- name: install ceph-mds package on redhat or SUSE/openSUSE package: name: "ceph-mds" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" diff --git a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml b/roles/ceph-nfs/tasks/pre_requisite_non_container.yml index 2d06c7a45..86d3a12a6 100644 --- a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml +++ b/roles/ceph-nfs/tasks/pre_requisite_non_container.yml @@ -7,7 +7,7 @@ include_tasks: pre_requisite_non_container_debian.yml when: ansible_os_family == 'Debian' -- name: install nfs rgw/cephfs gateway - suse +- name: install nfs rgw/cephfs gateway - SUSE/openSUSE zypper: name: "{{ item.name }}" disable_gpg_check: yes -- 2.39.5