From ba49225eabadb4fac6cc7cf5eb56a8ffe64ad47c Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Fri, 10 May 2019 15:28:18 -0400 Subject: [PATCH] Update RHCS version with Nautilus RHCS 4 will be based on Nautilus and only usable on RHEL 8. Updated the default ceph_rhcs_version to 4 and update the rhcs repositories to rhcs 4 with RHEL 8. Signed-off-by: Dimitri Savineau --- group_vars/all.yml.sample | 16 +++------------- group_vars/rhcs.yml.sample | 18 ++++-------------- rhcs_edits.txt | 4 ++-- .../installs/prerequisite_rhcs_cdn_install.yml | 6 +++--- roles/ceph-defaults/defaults/main.yml | 16 +++------------- 5 files changed, 15 insertions(+), 45 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 9c50e90d5..c27941592 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -166,23 +166,13 @@ dummy: #ceph_stable_redhat_distro: el7 -# REPOSITORY: RHCS VERSION RED HAT STORAGE (from 1.3) +# REPOSITORY: RHCS VERSION RED HAT STORAGE (from 4.0) # # Enabled when ceph_repository == 'rhcs' # -# This version is only supported on RHEL >= 7.1 -# As of RHEL 7.1, libceph.ko and rbd.ko are now included in Red Hat's kernel -# packages natively. The RHEL 7.1 kernel packages are more stable and secure than -# using these 3rd-party kmods with RHEL 7.0. Please update your systems to RHEL -# 7.1 or later if you want to use the kernel RBD client. +# This version is only supported on RHEL >= 8.0 # -# The CephFS kernel client is undergoing rapid development upstream, and we do -# not recommend running the CephFS kernel module on RHEL 7's 3.10 kernel at this -# time. Please use ELRepo's latest upstream 4.x kernels if you want to run CephFS -# on RHEL 7. -# -# -#ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(2) }}" +#ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(4) }}" #valid_ceph_repository_type: # - cdn # - iso diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 84546e7ec..d431ca112 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -166,23 +166,13 @@ ceph_repository: rhcs #ceph_stable_redhat_distro: el7 -# REPOSITORY: RHCS VERSION RED HAT STORAGE (from 1.3) +# REPOSITORY: RHCS VERSION RED HAT STORAGE (from 4.0) # # Enabled when ceph_repository == 'rhcs' # -# This version is only supported on RHEL >= 7.1 -# As of RHEL 7.1, libceph.ko and rbd.ko are now included in Red Hat's kernel -# packages natively. The RHEL 7.1 kernel packages are more stable and secure than -# using these 3rd-party kmods with RHEL 7.0. Please update your systems to RHEL -# 7.1 or later if you want to use the kernel RBD client. +# This version is only supported on RHEL >= 8.0 # -# The CephFS kernel client is undergoing rapid development upstream, and we do -# not recommend running the CephFS kernel module on RHEL 7's 3.10 kernel at this -# time. Please use ELRepo's latest upstream 4.x kernels if you want to run CephFS -# on RHEL 7. -# -# -ceph_rhcs_version: 3 +ceph_rhcs_version: 4 #valid_ceph_repository_type: # - cdn # - iso @@ -568,7 +558,7 @@ ceph_rhcs_version: 3 ########## #docker_exec_cmd: #docker: false -ceph_docker_image: "rhceph/rhceph-3-rhel7" +ceph_docker_image: "rhceph/rhceph-4-rhel8" ceph_docker_image_tag: "latest" ceph_docker_registry: "registry.access.redhat.com" ## Client only docker image - defaults to {{ ceph_docker_image }} diff --git a/rhcs_edits.txt b/rhcs_edits.txt index ad1b62034..f03186760 100644 --- a/rhcs_edits.txt +++ b/rhcs_edits.txt @@ -1,8 +1,8 @@ ceph_repository: rhcs ceph_origin: repository fetch_directory: ~/ceph-ansible-keys -ceph_rhcs_version: 3 -ceph_docker_image: "rhceph/rhceph-3-rhel7" +ceph_rhcs_version: 4 +ceph_docker_image: "rhceph/rhceph-4-rhel8" ceph_docker_image_tag: "latest" ceph_docker_registry: "registry.access.redhat.com" # END OF FILE, DO NOT TOUCH ME! \ No newline at end of file diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml index 648a10e3b..531e44f9d 100644 --- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml +++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml @@ -1,15 +1,15 @@ --- - name: enable red hat storage monitor repository rhsm_repository: - name: "rhel-7-server-rhceph-{{ ceph_rhcs_version }}-mon-rpms" + 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: "rhel-7-server-rhceph-{{ ceph_rhcs_version }}-osd-rpms" + 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: "rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms" + 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) diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 9b66021f8..adb468297 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -158,23 +158,13 @@ nfs_ganesha_stable_deb_repo: "{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_s ceph_stable_redhat_distro: el7 -# REPOSITORY: RHCS VERSION RED HAT STORAGE (from 1.3) +# REPOSITORY: RHCS VERSION RED HAT STORAGE (from 4.0) # # Enabled when ceph_repository == 'rhcs' # -# This version is only supported on RHEL >= 7.1 -# As of RHEL 7.1, libceph.ko and rbd.ko are now included in Red Hat's kernel -# packages natively. The RHEL 7.1 kernel packages are more stable and secure than -# using these 3rd-party kmods with RHEL 7.0. Please update your systems to RHEL -# 7.1 or later if you want to use the kernel RBD client. +# This version is only supported on RHEL >= 8.0 # -# The CephFS kernel client is undergoing rapid development upstream, and we do -# not recommend running the CephFS kernel module on RHEL 7's 3.10 kernel at this -# time. Please use ELRepo's latest upstream 4.x kernels if you want to run CephFS -# on RHEL 7. -# -# -ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(2) }}" +ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(4) }}" valid_ceph_repository_type: - cdn - iso -- 2.39.5