defaults: remove some package dependencies

These packages aren't needed anymore.
They were needed for ceph-init-detect buti as of ceph-init-detect doesn't exist
anymore.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1683885
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 5c98e361df5241fbfa5bd0a2ae1317219b7e1244)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 80cf90b9a8ff3f634e4a83adc2a572a62cda3b61..84fa6754e509df2a26040ba7fe0e4f9c25654d40 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -76,23 +76,12 @@ dummy:
 ############
 # PACKAGES #
 ############
-#debian_package_dependencies:
-#  - python-pycurl
-
 #centos_package_dependencies:
-#  - python-pycurl
 #  - epel-release
-#  - python-setuptools
 #  - libselinux-python
 
-#redhat_package_dependencies:
-#  - python-pycurl
-#  - python-setuptools
-
 #suse_package_dependencies:
-#  - python-pycurl
 #  - python-xml
-#  - python-setuptools
 
 # 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 be3ca9f09ce9cf38f6a477578b99c557e6a2e3c9..d001247b6e953ff22edfe62fb151f4bafc3b8303 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -76,23 +76,12 @@ fetch_directory: ~/ceph-ansible-keys
 ############
 # PACKAGES #
 ############
-#debian_package_dependencies:
-#  - python-pycurl
-
 #centos_package_dependencies:
-#  - python-pycurl
 #  - epel-release
-#  - python-setuptools
 #  - libselinux-python
 
-#redhat_package_dependencies:
-#  - python-pycurl
-#  - python-setuptools
-
 #suse_package_dependencies:
-#  - python-pycurl
 #  - python-xml
-#  - python-setuptools
 
 # Whether or not to install the ceph-test package.
 #ceph_test: false

diff --git a/roles/ceph-common/tasks/installs/install_on_debian.yml b/roles/ceph-common/tasks/installs/install_on_debian.yml
index 9a3978f001955c7cd78511cb41a4701a88f8f88f..d8b66b2fa8ea0058ed19194acda860277db2edf4 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_debian.yml
+++ b/roles/ceph-common/tasks/installs/install_on_debian.yml
@@ -11,15 +11,6 @@
   register: result
   until: result is succeeded
 
-- name: install dependencies
-  apt:
-    name: "{{ debian_package_dependencies }}"
-    state: present
-    update_cache: yes
-    cache_valid_time: 3600
-  register: result
-  until: result is succeeded
-
 - name: include install_debian_packages.yml
   include_tasks: install_debian_packages.yml
   when:

diff --git a/roles/ceph-common/tasks/installs/install_redhat_packages.yml b/roles/ceph-common/tasks/installs/install_redhat_packages.yml
index d692c175896acdfcdffc03fe99e5d41e3b4a48f8..cd34b860d9bfe8a43ed30cfc74fc393a2c4d7e32 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_redhat_packages.yml
+++ b/roles/ceph-common/tasks/installs/install_redhat_packages.yml
@@ -1,13 +1,4 @@
 ---
-- name: install redhat dependencies
-  package:
-    name: "{{ redhat_package_dependencies }}"
-    state: present
-  register: result
-  until: result is succeeded
-  when:
-    - ansible_distribution == 'RedHat'
-
 - name: install centos dependencies
   yum:
     name: "{{ centos_package_dependencies }}"

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 9b762dc03fdfad3239e27e4530cc464a71b24e54..cb14523e56c36fa17ac3e86ea3a5a7afc16e71cd 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -68,23 +68,12 @@ ceph_conf_local: false
 ############
 # PACKAGES #
 ############
-debian_package_dependencies:
-  - python-pycurl
-
 centos_package_dependencies:
-  - python-pycurl
   - epel-release
-  - python-setuptools
   - libselinux-python
 
-redhat_package_dependencies:
-  - python-pycurl
-  - python-setuptools
-
 suse_package_dependencies:
-  - python-pycurl
   - python-xml
-  - python-setuptools
 
 # Whether or not to install the ceph-test package.
 ceph_test: false