From b3c7c362997370644aee914ac88c9ad3d3a3ff88 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 26 Aug 2015 11:19:35 +0200 Subject: [PATCH] Make package dependencies configurable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Closes: #386 and #384 Signed-off-by: Sébastien Han --- group_vars/all.sample | 12 ++++++++++++ roles/ceph-common/defaults/main.yml | 12 ++++++++++++ .../ceph-common/tasks/installs/install_on_debian.yml | 5 +---- .../ceph-common/tasks/installs/install_on_redhat.yml | 7 +------ 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/group_vars/all.sample b/group_vars/all.sample index 71403ef35..52eabefd4 100644 --- a/group_vars/all.sample +++ b/group_vars/all.sample @@ -16,6 +16,18 @@ dummy: # /!\ EITHER ACTIVE ceph_stable OR ceph_stable_ice OR ceph_dev /!\ +#debian_package_dependencies: +# - python-pycurl +# - hdparm +# - ntp + +#redhat_package_dependencies: +# - python-pycurl +# - hdparm +# - yum-plugin-priorities.noarch +# - epel-release +# - ntp + # STABLE ######## diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml index ba48c6459..ad62ed2d5 100644 --- a/roles/ceph-common/defaults/main.yml +++ b/roles/ceph-common/defaults/main.yml @@ -13,6 +13,18 @@ restapi_group_name: restapis # /!\ EITHER ACTIVE ceph_stable OR ceph_stable_ice OR ceph_dev /!\ +debian_package_dependencies: + - python-pycurl + - hdparm + - ntp + +redhat_package_dependencies: + - python-pycurl + - hdparm + - yum-plugin-priorities.noarch + - epel-release + - ntp + # STABLE ######## diff --git a/roles/ceph-common/tasks/installs/install_on_debian.yml b/roles/ceph-common/tasks/installs/install_on_debian.yml index 002f1fdc6..9ed4ad490 100644 --- a/roles/ceph-common/tasks/installs/install_on_debian.yml +++ b/roles/ceph-common/tasks/installs/install_on_debian.yml @@ -5,10 +5,7 @@ state=present update_cache=yes cache_valid_time=3600 - with_items: - - python-pycurl - - ntp - - hdparm + with_items: debian_package_dependencies - name: install the ceph repository stable key apt_key: > diff --git a/roles/ceph-common/tasks/installs/install_on_redhat.yml b/roles/ceph-common/tasks/installs/install_on_redhat.yml index 8b4bb5aef..11d4e2a05 100644 --- a/roles/ceph-common/tasks/installs/install_on_redhat.yml +++ b/roles/ceph-common/tasks/installs/install_on_redhat.yml @@ -3,12 +3,7 @@ yum: > name={{ item }} state=present - with_items: - - python-pycurl - - ntp - - hdparm - - yum-plugin-priorities.noarch - - epel-release + with_items: redhat_package_dependencies - name: install the ceph stable repository key rpm_key: > -- 2.47.3