From e4033d83d047cbdfbc01f63db3b580c452e1f0ae Mon Sep 17 00:00:00 2001
From: Teoman ONAY <tonay@ibm.com>
Date: Tue, 17 Sep 2024 11:28:33 +0200
Subject: [PATCH] New Squid branch

Signed-off-by: Teoman ONAY <tonay@ibm.com>
---
 ceph_defaults/defaults/main.yml | 6 +++---
 ceph_defaults/meta/main.yml     | 4 ++--
 cephadm-preflight.yml           | 5 ++---
 doc/source/conf.py              | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ceph_defaults/defaults/main.yml b/ceph_defaults/defaults/main.yml
index a3b5c31..de1e834 100644
--- a/ceph_defaults/defaults/main.yml
+++ b/ceph_defaults/defaults/main.yml
@@ -2,14 +2,14 @@
 ceph_origin: community
 ceph_dev_branch: main
 ceph_dev_sha1: latest
-ceph_rhcs_version: 5
-ceph_ibm_version: 5
+ceph_rhcs_version: 8
+ceph_ibm_version: 8
 ceph_mirror: https://download.ceph.com
 ceph_stable_key: https://download.ceph.com/keys/release.asc
 ceph_community_repo_baseurl: "{{ ceph_mirror }}/rpm-{{ ceph_release }}/el{{ ansible_facts['distribution_major_version'] }}/"
 ceph_ibm_repo_baseurl: "https://public.dhe.ibm.com/ibmdl/export/pub/storage/ceph/{{ ceph_ibm_version }}/rhel{{ ansible_facts['distribution_major_version'] }}/"
 ceph_ibm_key: https://public.dhe.ibm.com/ibmdl/export/pub/storage/ceph/RPM-GPG-KEY-IBM-CEPH
-ceph_release: quincy
+ceph_release: squid
 upgrade_ceph_packages: false
 ceph_pkgs:
   - cephadm
diff --git a/ceph_defaults/meta/main.yml b/ceph_defaults/meta/main.yml
index 04504fa..4210556 100644
--- a/ceph_defaults/meta/main.yml
+++ b/ceph_defaults/meta/main.yml
@@ -4,14 +4,14 @@ galaxy_info:
   author: Guillaume Abrioux
   description: Handles ceph-ansible default vars for all roles
   license: Apache
-  min_ansible_version: 2.10
+  min_ansible_version: 2.15
   platforms:
     - name: Ubuntu
       versions:
         - bionic
     - name: EL
       versions:
-        - 8
+        - 9
   galaxy_tags:
     - system
 dependencies: []
diff --git a/cephadm-preflight.yml b/cephadm-preflight.yml
index 88c58e7..0a32b44 100644
--- a/cephadm-preflight.yml
+++ b/cephadm-preflight.yml
@@ -31,8 +31,7 @@
       - rhceph-4-osd-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms
     repos_5_to_disable:
       - rhceph-5-tools-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms
-    repos_6_to_disable:
-      - rhceph-6-tools-for-rhel-{{ ansible_facts['distribution_major_version'] }}-{{ ansible_facts['architecture'] }}-rpms
+    repos_to_disable: "{{ range(5, ceph_rhcs_version) | map('string') | map('regex_replace', '^', 'rhceph_') | map('regex_replace', '$', '-tools-for-rhel-' + ansible_facts['distribution_major_version'] + '-' + ansible_facts['architecture'] + '-rpms') | list }}"
     packages_to_uninstall:
       - ceph-mds
       - ceph-mgr
@@ -64,7 +63,7 @@
             - name: disable older rhceph repositories if any on RHEL{{ansible_facts['distribution_major_version']}}
               when: ansible_facts['distribution_major_version'] == '9'
               rhsm_repository:
-                name: "{{ repos_5_to_disable + repos_6_to_disable }}"
+                name: "{{ repos_to_disable }}"
                 state: absent
 
         - name: enable ceph package repositories
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 8520407..3b251be 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -22,7 +22,7 @@
 author = 'Guillaume Abrioux'
 
 # The full version, including alpha/beta/rc tags
-release = 'v2.0'
+release = 'v4.0'
 
 
 # -- General configuration ---------------------------------------------------