From 3c64abe07d0775fd905ab8ffc8d37a040af90677 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 9 Oct 2017 15:37:51 +0200 Subject: [PATCH] mds: move installation packages in role itself Make role `ceph-mds` handling itself the installation of `ceph-mds` package. Signed-off-by: Guillaume Abrioux --- .../tasks/installs/install_debian_packages.yml | 8 -------- .../installs/install_debian_rhcs_packages.yml | 7 ------- .../tasks/installs/install_redhat_packages.yml | 7 ------- roles/ceph-mds/tasks/non_containerized.yml | 17 +++++++++++++++++ 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/roles/ceph-common/tasks/installs/install_debian_packages.yml b/roles/ceph-common/tasks/installs/install_debian_packages.yml index 994fbcb1a..443da199e 100644 --- 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 468d76ae6..753b87e0c 100644 --- 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 8154a054f..291d1cca4 100644 --- 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 cff635f46..9cac6e6bf 100644 --- 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/ -- 2.39.5