Make package dependencies configurable

Closes: #386 and #384
Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/group_vars/all.sample b/group_vars/all.sample
index 71403ef3592adf43c762f8cc3981d3ba0308b4a3..52eabefd4acee2c459d66104f5e9780d03466e4a 100644 (file)
--- 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 ba48c6459d4115e5d438c78ecffe41e2cd59389f..ad62ed2d520f9561061a5609fd92ef1f8fed4239 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -13,6 +13,18 @@ restapi_group_name: restapis
 \r
 # /!\ EITHER ACTIVE ceph_stable OR ceph_stable_ice OR ceph_dev /!\\r
 \r
+debian_package_dependencies:\r
+  - python-pycurl\r
+  - hdparm\r
+  - ntp\r
+\r
+redhat_package_dependencies:\r
+  - python-pycurl\r
+  - hdparm\r
+  - yum-plugin-priorities.noarch\r
+  - epel-release\r
+  - ntp\r
+\r
 # STABLE\r
 ########\r
 \r

diff --git a/roles/ceph-common/tasks/installs/install_on_debian.yml b/roles/ceph-common/tasks/installs/install_on_debian.yml
index 002f1fdc6949eedf2e1832a469855e2e0bfb5f0d..9ed4ad49084d5de811d90d8d0ef59deea486b8bc 100644 (file)
--- 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 8b4bb5aef3b9f6c3e663d000b0dae6fc4ac0ea7c..11d4e2a057f0f7123cfaa8980161e311a185f1e9 100644 (file)
--- 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: >