mds: move installation packages in role itself

Make role `ceph-mds` handling itself the installation of `ceph-mds`
package.

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

diff --git a/roles/ceph-common/tasks/installs/install_debian_packages.yml b/roles/ceph-common/tasks/installs/install_debian_packages.yml
index 994fbcb1a1d6830dc6f3f9c0e4e554019fa6477a..443da199e8066a162ec7007a52ef9021f8b724f0 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_debian_packages.yml
+++ b/roles/ceph-common/tasks/installs/install_debian_packages.yml
@@ -28,14 +28,6 @@
   when:
     - rgw_group_name in group_names
 
-- name: install ceph mds for debian
-  apt:
-    name: ceph-mds
-    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-    default_release: "{{ ceph_stable_release_uca | default(omit) }}{{ ansible_distribution_release ~ '-backports' if ceph_origin == 'distro' and ceph_use_distro_backports else ''}}"
-  when:
-    - mds_group_name in group_names
-
 - name: install jemalloc for debian
   apt:
     name: libjemalloc1

diff --git a/roles/ceph-common/tasks/installs/install_debian_rhcs_packages.yml b/roles/ceph-common/tasks/installs/install_debian_rhcs_packages.yml
index 468d76ae65a61f4b1f9234d023a6472f7de81b4d..753b87e0cfd22abba94b448e7322a276ed0d68a9 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_debian_rhcs_packages.yml
+++ b/roles/ceph-common/tasks/installs/install_debian_rhcs_packages.yml
@@ -27,13 +27,6 @@
   when:
     - rgw_group_name in group_names
 
-- name: install red hat storage ceph mds for debian
-  apt:
-    pkg: ceph-mds
-    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when:
-    - mds_group_name in group_names
-
 - name: install red hat storage ceph-fuse client for debian
   apt:
     pkg: ceph-fuse

diff --git a/roles/ceph-common/tasks/installs/install_redhat_packages.yml b/roles/ceph-common/tasks/installs/install_redhat_packages.yml
index 8154a054f177896dffc077b71e3abc94cea88826..291d1cca46e9dcf517cc4aeefb91fc5f34a99b3c 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_redhat_packages.yml
+++ b/roles/ceph-common/tasks/installs/install_redhat_packages.yml
@@ -34,13 +34,6 @@
   when:
     - osd_group_name in group_names
 
-- name: install redhat ceph-mds package
-  package:
-    name: "ceph-mds"
-    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when:
-    - mds_group_name in group_names
-
 - name: install redhat ceph-fuse package
   package:
     name: "ceph-fuse"

diff --git a/roles/ceph-mds/tasks/non_containerized.yml b/roles/ceph-mds/tasks/non_containerized.yml
index cff635f46ba315028e139a59818e58cf4bc9f818..9cac6e6bf8bbe727d5b9d226d28bf1d49f3b37fa 100644 (file)
--- a/roles/ceph-mds/tasks/non_containerized.yml
+++ b/roles/ceph-mds/tasks/non_containerized.yml
@@ -1,4 +1,21 @@
 ---
+- name: install ceph mds for debian
+  apt:
+    name: ceph-mds
+    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
+    default_release: "{{ ceph_stable_release_uca | default(omit) }}{{ ansible_distribution_release ~ '-backports' if ceph_origin == 'distro' and ceph_use_distro_backports else ''}}"
+  when:
+    - mds_group_name in group_names
+    - ansible_os_family == 'Debian'
+
+- name: install redhat ceph-mds package
+  package:
+    name: "ceph-mds"
+    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
+  when:
+    - mds_group_name in group_names
+    - ansible_os_family == 'RedHat'
+
 - name: create bootstrap-mds directory
   file:
     path: /var/lib/ceph/bootstrap-mds/