From b199bdcfabf0567277b6c72267c03d5387e0175b Mon Sep 17 00:00:00 2001 From: Ben England Date: Tue, 5 Apr 2016 21:11:37 -0400 Subject: [PATCH 1/2] fix when clauses for installation of ceph RPM --- .../tasks/installs/install_on_redhat.yml | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/roles/ceph-common/tasks/installs/install_on_redhat.yml b/roles/ceph-common/tasks/installs/install_on_redhat.yml index 5a346e75dc..b079a4dbed 100644 --- a/roles/ceph-common/tasks/installs/install_on_redhat.yml +++ b/roles/ceph-common/tasks/installs/install_on_redhat.yml @@ -44,11 +44,10 @@ - ceph - ceph-mon when: - (ceph_origin == "distro" or ceph_stable_rh_storage) and + (ceph_origin == "distro" or ceph_stable_rh_storage or + (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and mon_group_name in group_names and - ansible_pkg_mgr == "yum" and - ceph_stable and - ceph_stable_release not in ceph_stable_releases + ansible_pkg_mgr == "yum" - name: install distro or red hat storage ceph mon dnf: @@ -58,11 +57,10 @@ - ceph - ceph-mon when: - (ceph_origin == "distro" or ceph_stable_rh_storage) and + (ceph_origin == "distro" or ceph_stable_rh_storage or + (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and mon_group_name in group_names and - ansible_pkg_mgr == "dnf" and - ceph_stable and - ceph_stable_release not in ceph_stable_releases + ansible_pkg_mgr == "dnf" - name: install distro or red hat storage ceph osd yum: @@ -72,11 +70,10 @@ - ceph - ceph-osd when: - (ceph_origin == "distro" or ceph_stable_rh_storage) and + (ceph_origin == "distro" or ceph_stable_rh_storage or + (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and osd_group_name in group_names and - ansible_pkg_mgr == "yum" and - ceph_stable and - ceph_stable_release not in ceph_stable_releases + ansible_pkg_mgr == "yum" - name: install distro or red hat storage ceph osd dnf: @@ -86,11 +83,10 @@ - ceph - ceph-osd when: - (ceph_origin == "distro" or ceph_stable_rh_storage) and + (ceph_origin == "distro" or ceph_stable_rh_storage or + (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and osd_group_name in group_names and - ansible_pkg_mgr == "dnf" and - ceph_stable and - ceph_stable_release not in ceph_stable_releases + ansible_pkg_mgr == "dnf" - name: install ceph-test yum: From ee9093d5706989422a7ab3a5795656a47a379ec7 Mon Sep 17 00:00:00 2001 From: Ben England Date: Wed, 6 Apr 2016 13:14:24 -0400 Subject: [PATCH 2/2] Sebastien's suggestion - add infernalis to list of releases with no separate ceph-mon or ceph-osd --- .../tasks/installs/install_on_redhat.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/roles/ceph-common/tasks/installs/install_on_redhat.yml b/roles/ceph-common/tasks/installs/install_on_redhat.yml index b079a4dbed..f4541ebfd2 100644 --- a/roles/ceph-common/tasks/installs/install_on_redhat.yml +++ b/roles/ceph-common/tasks/installs/install_on_redhat.yml @@ -36,6 +36,13 @@ state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" when: not ceph_stable_rh_storage +# include Infernalis in the set of releases that do not have +# a separate ceph-mon package or ceph-osd package +# Note: Red Hat Ceph Storage is different, DOES separate them even in hammer + +- set_fact: > + ceph_stable_rel_pkg="{{ ceph_stable_releases | union([ 'infernalis' ]) }}" + - name: install distro or red hat storage ceph mon yum: name: "{{ item }}" @@ -45,7 +52,7 @@ - ceph-mon when: (ceph_origin == "distro" or ceph_stable_rh_storage or - (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and + (ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and mon_group_name in group_names and ansible_pkg_mgr == "yum" @@ -58,7 +65,7 @@ - ceph-mon when: (ceph_origin == "distro" or ceph_stable_rh_storage or - (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and + (ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and mon_group_name in group_names and ansible_pkg_mgr == "dnf" @@ -71,7 +78,7 @@ - ceph-osd when: (ceph_origin == "distro" or ceph_stable_rh_storage or - (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and + (ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and osd_group_name in group_names and ansible_pkg_mgr == "yum" @@ -84,7 +91,7 @@ - ceph-osd when: (ceph_origin == "distro" or ceph_stable_rh_storage or - (ceph_stable and ceph_stable_release not in ceph_stable_releases)) and + (ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and osd_group_name in group_names and ansible_pkg_mgr == "dnf"