From: Johannes Kastl Date: Tue, 20 Aug 2019 10:32:19 +0000 (+0200) Subject: move python-xml to raw_install_python.yml X-Git-Tag: v5.0.0alpha1~96 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5cf22e9b312bb26b3144c329e6e597a0905b274a;p=ceph-ansible.git 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 --- diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 4005e5ca2..ff76bb82f 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -89,8 +89,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 2484c4f57..a84b11be2 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -89,8 +89,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 a96f10d80..dd929ba9b 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -81,8 +81,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