mgr: move installation packages in role itself

Make role `ceph-mgr` handling itself the installation of `ceph-mgr`
package because it's complicated to manage it regarding we are going to
install `jewel vs. luminous`

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 7092d29bbe504d6ad9b2d53dd70a133bfefbdd9b..994fbcb1a1d6830dc6f3f9c0e4e554019fa6477a 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_debian_packages.yml
+++ b/roles/ceph-common/tasks/installs/install_debian_packages.yml
@@ -60,11 +60,3 @@
   when:
     - nfs_group_name in group_names
     - nfs_obj_gw
-
-- name: install ceph mgr for debian
-  apt:
-    name: ceph-mgr
-    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:
-    - mgr_group_name in group_names

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 bcc444f930cc12305d0996a416ecc396b4fdc6d6..468d76ae65a61f4b1f9234d023a6472f7de81b4d 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_debian_rhcs_packages.yml
+++ b/roles/ceph-common/tasks/installs/install_debian_rhcs_packages.yml
@@ -70,10 +70,3 @@
   when:
     - nfs_group_name in group_names
     - nfs_obj_gw
-
-- name: install ceph mgr for debian
-  apt:
-    pkg: ceph-mgr
-    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when:
-    - mgr_group_name in group_names

diff --git a/roles/ceph-common/tasks/installs/install_redhat_packages.yml b/roles/ceph-common/tasks/installs/install_redhat_packages.yml
index ea12b07f4644baa7e4713a2922dc5151c3116d9b..31c749c3d175357196f1796078df42f5a07ef122 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_redhat_packages.yml
+++ b/roles/ceph-common/tasks/installs/install_redhat_packages.yml
@@ -94,13 +94,6 @@
     - nfs_group_name in group_names
     - nfs_obj_gw
 
-- name: install redhat ceph-mgr package
-  package:
-    name: ceph-mgr
-    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when:
-    - mgr_group_name in group_names
-
 - name: install redhat ceph iscsi package
   package:
     name: "{{ item }}"

diff --git a/roles/ceph-mgr/tasks/pre_requisite.yml b/roles/ceph-mgr/tasks/pre_requisite.yml
index 80e9b3f4580b4ae88aa03701a007fbb282939445..4c3e314e19a6abebea244cbd6194c8f011db4d61 100644 (file)
--- a/roles/ceph-mgr/tasks/pre_requisite.yml
+++ b/roles/ceph-mgr/tasks/pre_requisite.yml
@@ -1,4 +1,19 @@
 ---
+- name: install redhat ceph-mgr package
+  package:
+    name: ceph-mgr
+    state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
+  when:
+    - ansible_os_family == 'RedHat'
+
+- name: install ceph mgr for debian
+  apt:
+    name: ceph-mgr
+    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:
+    - ansible_os_family == 'Debian'
+
 - name: create mgr directory
   file:
     path: /var/lib/ceph/mgr/