rhcs: update release to 5 for octopus

RHCS 5 will be based on Ceph Octopus release and only supported on
RHEL 8.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 3737098577e860a0bea7108bc217c569fab2f476..c1f8bb340355709e3d2e7c3b12ccd888bc0de341 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -163,13 +163,13 @@ dummy:
 #ceph_stable_redhat_distro: el8
 
 
-# REPOSITORY: RHCS VERSION RED HAT STORAGE (from 4.0)
+# REPOSITORY: RHCS VERSION RED HAT STORAGE (from 5.0)
 #
 # Enabled when ceph_repository == 'rhcs'
 #
-# This version is supported on RHEL 7 and 8
+# This version is supported on RHEL 8
 #
-#ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(4) }}"
+#ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(5) }}"
 #valid_ceph_repository_type:
 #  - cdn
 #  - iso

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index f816c6f98b0103a5fe389519cd0e22f1f282935c..7dca92f36f00dd04e2b9666ae04abb877e2d20bb 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -163,13 +163,13 @@ ceph_repository: rhcs
 #ceph_stable_redhat_distro: el8
 
 
-# REPOSITORY: RHCS VERSION RED HAT STORAGE (from 4.0)
+# REPOSITORY: RHCS VERSION RED HAT STORAGE (from 5.0)
 #
 # Enabled when ceph_repository == 'rhcs'
 #
-# This version is supported on RHEL 7 and 8
+# This version is supported on RHEL 8
 #
-ceph_rhcs_version: 4
+ceph_rhcs_version: 5
 #valid_ceph_repository_type:
 #  - cdn
 #  - iso
@@ -589,7 +589,7 @@ ceph_iscsi_config_dev: false
 ##########
 # DOCKER #
 ##########
-ceph_docker_image: "rhceph/rhceph-4-rhel8"
+ceph_docker_image: "rhceph/rhceph-5-rhel8"
 ceph_docker_image_tag: "latest"
 ceph_docker_registry: "registry.redhat.io"
 ceph_docker_registry_auth: true

diff --git a/rhcs_edits.txt b/rhcs_edits.txt
index 84f3bc936e809fd6bd66e5054eac55bc8ae23e59..4eda244f2d04aeed436c242f01581fe22467c067 100644 (file)
--- a/rhcs_edits.txt
+++ b/rhcs_edits.txt
@@ -2,8 +2,8 @@ ceph_repository: rhcs
 ceph_origin: repository
 ceph_iscsi_config_dev: false
 fetch_directory: ~/ceph-ansible-keys
-ceph_rhcs_version: 4
-ceph_docker_image: "rhceph/rhceph-4-rhel8"
+ceph_rhcs_version: 5
+ceph_docker_image: "rhceph/rhceph-5-rhel8"
 ceph_docker_image_tag: "latest"
 ceph_docker_registry: "registry.redhat.io"
 ceph_docker_registry_auth: true

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 50e7eb5db2d1542d58649de70655be4c63f3a5dd..531e44f9d3535afbe156553dfdce9e2c3e3ad918 100644 (file)
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
+++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
@@ -1,36 +1,15 @@
 ---
-- 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 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)
+- 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 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)

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index ff9a6ad500df4b343b071dc663e0adca5d4132e5..45249c75bd74e437dbd1b5cc91d535dda51d0bda 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -155,13 +155,13 @@ nfs_ganesha_stable_deb_repo: "{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_s
 ceph_stable_redhat_distro: el8
 
 
-# REPOSITORY: RHCS VERSION RED HAT STORAGE (from 4.0)
+# REPOSITORY: RHCS VERSION RED HAT STORAGE (from 5.0)
 #
 # Enabled when ceph_repository == 'rhcs'
 #
-# This version is supported on RHEL 7 and 8
+# This version is supported on RHEL 8
 #
-ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(4) }}"
+ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(5) }}"
 valid_ceph_repository_type:
   - cdn
   - iso