From 146f2e8de3653ba8d93ab63d67cd13c24c71ceab Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Tue, 20 Aug 2019 12:32:19 +0200 Subject: [PATCH] move python-xml to raw_install_python.yml The package python-xml is needed for ansible's zypper module to interact with the zypper package management tool. roles/ceph-defaults/defaults/main.yml: Remove python-xml from variable suse_package_dependencies to only install python-xml on SUSE/openSUSE if python is not found. raw_install_python.yml already contains all the logic needed to check if there is a valid python installation, so this is better suited there. openSUSE Leap 15.x / SLES 15.x do no longer have /usr/bin/python, only /usr/bin/python3, which already contains the xml module, so nothing needs to be installed in that case. Signed-off-by: Johannes Kastl (cherry picked from commit 5cf22e9b312bb26b3144c329e6e597a0905b274a) --- group_vars/all.yml.sample | 3 +-- group_vars/rhcs.yml.sample | 3 +-- roles/ceph-defaults/defaults/main.yml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 88f14170f..d5cc34536 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -88,8 +88,7 @@ dummy: #redhat_package_dependencies: [] -#suse_package_dependencies: -# - python-xml +#suse_package_dependencies: [] # Whether or not to install the ceph-test package. #ceph_test: false diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 0ab1e0d28..0f7072bbd 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -88,8 +88,7 @@ fetch_directory: ~/ceph-ansible-keys #redhat_package_dependencies: [] -#suse_package_dependencies: -# - python-xml +#suse_package_dependencies: [] # Whether or not to install the ceph-test package. #ceph_test: false diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index b3839d927..621317686 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -80,8 +80,7 @@ centos_package_dependencies: redhat_package_dependencies: [] -suse_package_dependencies: - - python-xml +suse_package_dependencies: [] # Whether or not to install the ceph-test package. ceph_test: false