defaults: refact package dependencies installation.

Because 5c98e361df5241fbfa5bd0a2ae1317219b7e1244 could be seen as a non
backward compatible change this commit reverts it and bring back package
dependencies installation support.
Let's just modify the default value instead.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 84fa6754e509df2a26040ba7fe0e4f9c25654d40..5b7258cc327405c77fd960f6cf0b00a85b7e0a40 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -76,10 +76,14 @@ dummy:
 ############
 # PACKAGES #
 ############
+#debian_package_dependencies: []
+
 #centos_package_dependencies:
 #  - epel-release
 #  - libselinux-python
 
+#redhat_package_dependencies: []
+
 #suse_package_dependencies:
 #  - python-xml
 

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index d001247b6e953ff22edfe62fb151f4bafc3b8303..ff62ab1ba1c8cd22ab63b9a1522802a3e8296b48 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -76,10 +76,14 @@ fetch_directory: ~/ceph-ansible-keys
 ############
 # PACKAGES #
 ############
+#debian_package_dependencies: []
+
 #centos_package_dependencies:
 #  - epel-release
 #  - libselinux-python
 
+#redhat_package_dependencies: []
+
 #suse_package_dependencies:
 #  - python-xml
 

diff --git a/roles/ceph-common/tasks/installs/install_on_debian.yml b/roles/ceph-common/tasks/installs/install_on_debian.yml
index d8b66b2fa8ea0058ed19194acda860277db2edf4..9a3978f001955c7cd78511cb41a4701a88f8f88f 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_debian.yml
+++ b/roles/ceph-common/tasks/installs/install_on_debian.yml
@@ -11,6 +11,15 @@
   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 cd34b860d9bfe8a43ed30cfc74fc393a2c4d7e32..d692c175896acdfcdffc03fe99e5d41e3b4a48f8 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_redhat_packages.yml
+++ b/roles/ceph-common/tasks/installs/install_redhat_packages.yml
@@ -1,4 +1,13 @@
 ---
+- 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 cb14523e56c36fa17ac3e86ea3a5a7afc16e71cd..7688e0dc49107962a28f01ad1dc053b7c277a567 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -68,10 +68,14 @@ ceph_conf_local: false
 ############
 # PACKAGES #
 ############
+debian_package_dependencies: []
+
 centos_package_dependencies:
   - epel-release
   - libselinux-python
 
+redhat_package_dependencies: []
+
 suse_package_dependencies:
   - python-xml