Removed infernalis workaround because ceph_stable_releases now includes it by default

pull/664/head
James Saint-Rossy 2016-04-09 17:21:36 -04:00
parent 4e7b93d725
commit 3f9bd5c1b7
1 changed files with 4 additions and 11 deletions

View File

@ -36,13 +36,6 @@
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 }}"
@ -52,7 +45,7 @@
- ceph-mon
when:
(ceph_origin == "distro" or ceph_stable_rh_storage or
(ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and
(ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
mon_group_name in group_names and
ansible_pkg_mgr == "yum"
@ -65,7 +58,7 @@
- ceph-mon
when:
(ceph_origin == "distro" or ceph_stable_rh_storage or
(ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and
(ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
mon_group_name in group_names and
ansible_pkg_mgr == "dnf"
@ -78,7 +71,7 @@
- ceph-osd
when:
(ceph_origin == "distro" or ceph_stable_rh_storage or
(ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and
(ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
osd_group_name in group_names and
ansible_pkg_mgr == "yum"
@ -91,7 +84,7 @@
- ceph-osd
when:
(ceph_origin == "distro" or ceph_stable_rh_storage or
(ceph_stable and ceph_stable_release not in ceph_stable_rel_pkg)) and
(ceph_stable and ceph_stable_release not in ceph_stable_releases)) and
osd_group_name in group_names and
ansible_pkg_mgr == "dnf"