Make RHEL installs honor ceph_origin: distro

Installs on RHEL with ceph_origin set to distro previously would fail
because no packages would get installed, but all of the checks passed
fine. This adds support for ceph_origin: distro, simply installing the
packages using yum/dnf and assuming that the sysadmin has provided a
repository containing them.

This also supports the use case where Satellite or a similar local
mirror is in use, and the admin does not or cannot use the additional
repositories the role would otherwise add.
pull/559/head
Chris St. Pierre 2016-02-23 11:30:26 -06:00
parent 63d7824c9c
commit 731c39a179
1 changed files with 8 additions and 8 deletions

View File

@ -23,7 +23,7 @@
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
when: not ceph_stable_rh_storage
- name: install red hat storage ceph mon
- name: install distro or red hat storage ceph mon
yum:
name: "{{ item }}"
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
@ -31,11 +31,11 @@
- ceph
- ceph-mon
when:
ceph_stable_rh_storage and
(ceph_origin == "distro" or ceph_stable_rh_storage) and
mon_group_name in group_names and
ansible_pkg_mgr == "yum"
- name: install red hat storage ceph mon
- name: install distro or red hat storage ceph mon
dnf:
name: "{{ item }}"
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
@ -43,11 +43,11 @@
- ceph
- ceph-mon
when:
ceph_stable_rh_storage and
(ceph_origin == "distro" or ceph_stable_rh_storage) and
mon_group_name in group_names and
ansible_pkg_mgr == "dnf"
- name: install red hat storage ceph osd
- name: install distro or red hat storage ceph osd
yum:
name: "{{ item }}"
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
@ -55,11 +55,11 @@
- ceph
- ceph-osd
when:
ceph_stable_rh_storage and
(ceph_origin == "distro" or ceph_stable_rh_storage) and
osd_group_name in group_names and
ansible_pkg_mgr == "yum"
- name: install red hat storage ceph osd
- name: install distro or red hat storage ceph osd
dnf:
name: "{{ item }}"
state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
@ -67,7 +67,7 @@
- ceph
- ceph-osd
when:
ceph_stable_rh_storage and
(ceph_origin == "distro" or ceph_stable_rh_storage) and
osd_group_name in group_names and
ansible_pkg_mgr == "dnf"