]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
move python-xml to raw_install_python.yml
authorJohannes Kastl <kastl@b1-systems.de>
Tue, 20 Aug 2019 10:32:19 +0000 (12:32 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Fri, 27 Sep 2019 12:19:32 +0000 (14:19 +0200)
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 <kastl@b1-systems.de>
group_vars/all.yml.sample
group_vars/rhcs.yml.sample
roles/ceph-defaults/defaults/main.yml

index 4005e5ca26f1bab43cbe65385373eaf03166998b..ff76bb82fcee0e7c5719ee247025c5854a6a729b 100644 (file)
@@ -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
index 2484c4f571c4b70a938715c9fe92ac0d863e4b50..a84b11be2ca87ed647fde33c6ecb05b79187c459 100644 (file)
@@ -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
index a96f10d80e31df34c974af534e5798b9fac6e683..dd929ba9b7390e0cf1591c1c5e00bc26fe7a5164 100644 (file)
@@ -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