From 5aca0996ed07a9707ad3a5fd8005baead4d5e204 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 15 Apr 2019 16:38:50 +0200 Subject: [PATCH] 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 (cherry picked from commit 5c98e361df5241fbfa5bd0a2ae1317219b7e1244) --- group_vars/all.yml.sample | 11 ----------- group_vars/rhcs.yml.sample | 11 ----------- .../ceph-common/tasks/installs/install_on_debian.yml | 9 --------- .../tasks/installs/install_redhat_packages.yml | 9 --------- roles/ceph-defaults/defaults/main.yml | 11 ----------- 5 files changed, 51 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 80cf90b9a..84fa6754e 100644 --- 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 be3ca9f09..d001247b6 100644 --- 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 9a3978f00..d8b66b2fa 100644 --- 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 d692c1758..cd34b860d 100644 --- 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 9b762dc03..cb14523e5 100644 --- 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