]> git.apps.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 15:50:10 +0000 (17:50 +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>
(cherry picked from commit 5cf22e9b312bb26b3144c329e6e597a0905b274a)

group_vars/all.yml.sample
group_vars/rhcs.yml.sample
roles/ceph-defaults/defaults/main.yml

index 88f14170fe060f587b101b75d35b8dc51666fb05..d5cc3453613a1c621dc87807a56cc045072b43a7 100644 (file)
@@ -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
index 0ab1e0d28c524d2596ddcb7abdc2123a77785d5f..0f7072bbdf88a412fed0c2b3eb3f60b6c7905d52 100644 (file)
@@ -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
index b3839d927c3b7a368e436e21df5100a97a34290e..6213176861b87df1b249375ce176c08a669b965d 100644 (file)
@@ -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