Sebastien's suggestion - add infernalis to list of releases with no separate ceph-mon or ceph-osd

pull/684/head
Ben England 2016-04-06 13:14:24 -04:00
parent b199bdcfab
commit ee9093d570
1 changed files with 11 additions and 4 deletions

View File

@ -36,6 +36,13 @@
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}" state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
when: not ceph_stable_rh_storage 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 - name: install distro or red hat storage ceph mon
yum: yum:
name: "{{ item }}" name: "{{ item }}"
@ -45,7 +52,7 @@
- ceph-mon - ceph-mon
when: when:
(ceph_origin == "distro" or ceph_stable_rh_storage or (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 mon_group_name in group_names and
ansible_pkg_mgr == "yum" ansible_pkg_mgr == "yum"
@ -58,7 +65,7 @@
- ceph-mon - ceph-mon
when: when:
(ceph_origin == "distro" or ceph_stable_rh_storage or (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 mon_group_name in group_names and
ansible_pkg_mgr == "dnf" ansible_pkg_mgr == "dnf"
@ -71,7 +78,7 @@
- ceph-osd - ceph-osd
when: when:
(ceph_origin == "distro" or ceph_stable_rh_storage or (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 osd_group_name in group_names and
ansible_pkg_mgr == "yum" ansible_pkg_mgr == "yum"
@ -84,7 +91,7 @@
- ceph-osd - ceph-osd
when: when:
(ceph_origin == "distro" or ceph_stable_rh_storage or (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 osd_group_name in group_names and
ansible_pkg_mgr == "dnf" ansible_pkg_mgr == "dnf"