From: Sébastien Han <seb@redhat.com>
Date: Wed, 26 Aug 2015 09:19:35 +0000 (+0200)
Subject: Make package dependencies configurable
X-Git-Tag: v1.0.0~125^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F390%2Fhead;p=ceph-ansible.git

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 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: >