ceph-common: rhcs 4 repositories for rhel 7

RHCS 4 is available for both RHEL 7 and 8 so we should also enable the
cdn repositories for that distribution.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1796853

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 9b40a959b9)
pull/5038/head
Dimitri Savineau 2020-01-31 08:59:21 -05:00 committed by Guillaume Abrioux
parent 76753e64f9
commit 80f1b0feb0
4 changed files with 36 additions and 15 deletions

View File

@ -173,7 +173,7 @@ dummy:
#
# Enabled when ceph_repository == 'rhcs'
#
# This version is only supported on RHEL >= 8.0
# This version is supported on RHEL 7 and 8
#
#ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(4) }}"
#valid_ceph_repository_type:

View File

@ -173,7 +173,7 @@ ceph_repository: rhcs
#
# Enabled when ceph_repository == 'rhcs'
#
# This version is only supported on RHEL >= 8.0
# This version is supported on RHEL 7 and 8
#
ceph_rhcs_version: 4
#valid_ceph_repository_type:

View File

@ -1,15 +1,36 @@
---
- name: enable red hat storage monitor repository
rhsm_repository:
name: "rhceph-{{ ceph_rhcs_version }}-mon-for-rhel-8-{{ ansible_architecture }}-rpms"
when: (mon_group_name in group_names or mgr_group_name in group_names)
- name: "rhcs {{ ceph_rhcs_version }} on rhel 8"
when: ansible_distribution_major_version | int == 8
block:
- name: enable red hat storage monitor repository
rhsm_repository:
name: "rhceph-{{ ceph_rhcs_version }}-mon-for-rhel-8-{{ ansible_architecture }}-rpms"
when: (mon_group_name in group_names or mgr_group_name in group_names)
- name: enable red hat storage osd repository
rhsm_repository:
name: "rhceph-{{ ceph_rhcs_version }}-osd-for-rhel-8-{{ ansible_architecture }}-rpms"
when: osd_group_name in group_names
- name: enable red hat storage osd repository
rhsm_repository:
name: "rhceph-{{ ceph_rhcs_version }}-osd-for-rhel-8-{{ ansible_architecture }}-rpms"
when: osd_group_name in group_names
- name: enable red hat storage tools repository
rhsm_repository:
name: "rhceph-{{ ceph_rhcs_version }}-tools-for-rhel-8-{{ ansible_architecture }}-rpms"
when: (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names or iscsi_gw_group_name in group_names or client_group_name in group_names)
- name: enable red hat storage tools repository
rhsm_repository:
name: "rhceph-{{ ceph_rhcs_version }}-tools-for-rhel-8-{{ ansible_architecture }}-rpms"
when: (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names or iscsi_gw_group_name in group_names or client_group_name in group_names)
- name: "rhcs {{ ceph_rhcs_version }} on rhel 7"
when: ansible_distribution_major_version | int == 7
block:
- name: enable red hat storage monitor repository
rhsm_repository:
name: "rhel-7-server-rhceph-{{ ceph_rhcs_version }}-mon-rpms"
when: (mon_group_name in group_names or mgr_group_name in group_names)
- name: enable red hat storage osd repository
rhsm_repository:
name: "rhel-7-server-rhceph-{{ ceph_rhcs_version }}-osd-rpms"
when: osd_group_name in group_names
- name: enable red hat storage tools repository
rhsm_repository:
name: "rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms"
when: (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names or iscsi_gw_group_name in group_names or client_group_name in group_names)

View File

@ -165,7 +165,7 @@ ceph_stable_redhat_distro: el7
#
# Enabled when ceph_repository == 'rhcs'
#
# This version is only supported on RHEL >= 8.0
# This version is supported on RHEL 7 and 8
#
ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(4) }}"
valid_ceph_repository_type: