drop rhcs references

RHCS moved away from ceph-ansible. All RHCS references should be removed. Signed-off-by: Guillaume Abrioux <[email protected]>
ceph · Mar 7, 2024 · 39bb371 · 39bb371
1 parent dc75923
commit 39bb371
Show file tree

Hide file tree

Showing 25 changed files with 15 additions and 1,062 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -14,7 +14,6 @@
   or the name of a logical grouping of code. Examples:
   - library: add a placeholder module for the validate action plugin
   - site.yml: combine validate play with fact gathering play
-  - rhcs: bump version to 3.0 for stable 3.1
 - Commits linked with an issue should trace them with :
   - Fixes: #2653
 

diff --git a/ceph-ansible.spec.in b/ceph-ansible.spec.in
@@ -47,8 +47,6 @@ pushd %{buildroot}%{_datarootdir}/ceph-ansible
   %if ! 0%{?fedora} && ! 0%{?centos}
     # remove ability to install ceph community version
     rm roles/ceph-common/tasks/installs/redhat_{community,dev}_repository.yml
-    # Ship only the Red Hat Ceph Storage config (overwrite upstream settings)
-    cp group_vars/rhcs.yml.sample group_vars/all.yml.sample
   %endif
 popd
 

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -189,7 +189,6 @@ The following install options are also validated by the ``ceph-validate`` role:
 - ``ceph_origin`` set to ``distro``
 - ``ceph_origin`` set to ``repository``
 - ``ceph_origin`` set to ``local``
-- ``ceph_repository`` set to ``rhcs``
 - ``ceph_repository`` set to ``dev``
 - ``ceph_repository`` set to ``community``
 

diff --git a/docs/source/installation/non-containerized.rst b/docs/source/installation/non-containerized.rst
@@ -5,7 +5,7 @@ The following are all of the available options for the installing Ceph through d
 
 We support 3 main installation methods, all managed by the ``ceph_origin`` variable:
 
-- ``repository``: means that you will get Ceph installed through a new repository. Later below choose between ``community``, ``rhcs`` or ``dev``. These options will be exposed through the ``ceph_repository`` variable.
+- ``repository``: means that you will get Ceph installed through a new repository. Later below choose between ``community`` or ``dev``. These options will be exposed through the ``ceph_repository`` variable.
 - ``distro``: means that no separate repo file will be added and you will get whatever version of Ceph is included in your Linux distro.
 - ``local``: means that the Ceph binaries will be copied over from the local machine (not well tested, use at your own risk)
 
@@ -15,7 +15,6 @@ Origin: Repository
 If ``ceph_origin`` is set to ``repository``, you now have the choice between a couple of repositories controlled by the ``ceph_repository`` option:
 
 - ``community``: fetches packages from http://download.ceph.com, the official community Ceph repositories
-- ``rhcs``: means you are a Red Hat customer
 - ``dev``: fetches packages from shaman, a gitbuilder based package system
 - ``uca``: fetches packages from Ubuntu Cloud Archive
 - ``custom``: fetches packages from a specific repository
@@ -25,13 +24,6 @@ Community repository
 
 If ``ceph_repository`` is set to ``community``, packages you will be by default installed from http://download.ceph.com, this can be changed by tweaking ``ceph_mirror``.
 
-RHCS repository
-~~~~~~~~~~~~~~~
-
-RHCS is the Red Hat Ceph Storage product from Red Hat, the enterprise version of Ceph.
-If ``ceph_repository`` is set to ``rhcs``, packages you will be installed from Red Hat sources.
-
-To choose a specific version of RHCS you can set the ``ceph_rhcs_version`` variable accordingly, e.g: ``ceph_rhcs_version: 2``.
 
 UCA repository
 ~~~~~~~~~~~~~~

diff --git a/docs/source/testing/tox.rst b/docs/source/testing/tox.rst
@@ -71,5 +71,5 @@ in the dynamic matrix that tox creates. Inside of ``{}`` you can include a comma
 of the *factor* name as those are used by tox as the separator between different factor sets.
 
 For example, if wanted to add a new test *factor* for the next Ceph release of luminious this is how you'd accomplish that. Currently, the first factor set in our ``envlist``
-is used to define the Ceph release (``{jewel,kraken,rhcs}-...``). To add luminous you'd change that to look like ``{luminous,kraken,rhcs}-...``. In the ``testenv`` section
+is used to define the Ceph release (``{jewel,kraken}-...``). To add luminous you'd change that to look like ``{luminous,kraken}-...``. In the ``testenv`` section
 this is a subsection called ``setenv`` which allows you to provide environment variables to the tox environment and we support an environment variable called ``CEPH_STABLE_RELEASE``. To ensure that all the new tests that are created by adding the luminous *factor* you'd do this in that section: ``luminous: CEPH_STABLE_RELEASE=luminous``.
diff --git a/generate_group_vars_sample.sh b/generate_group_vars_sample.sh
@@ -47,12 +47,6 @@ generate_group_vars_file () {
   done
 }
 
-rhcs_edits () {
-  tail -n +1 rhcs_edits.txt | while IFS= read -r option; do
-    sed -i "s|#${option% *} .*|${option}|" group_vars/rhcs.yml.sample
-  done
-}
-
 ########
 # MAIN #
 ########
@@ -61,7 +55,7 @@ for role in "$basedir"/roles/ceph-*; do
   rolename=$(basename "$role")
 
   if [[ $rolename == "ceph-defaults" ]]; then
-    output="all.yml.sample rhcs.yml.sample"
+    output="all.yml.sample"
   elif [[ $rolename == "ceph-fetch-keys" ]]; then
     output="ceph-fetch-keys.yml.sample"
   elif [[ $rolename == "ceph-rbd-mirror" ]]; then
@@ -82,5 +76,3 @@ for role in "$basedir"/roles/ceph-*; do
     generate_group_vars_file
   fi
 done
-
-rhcs_edits
diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
@@ -32,6 +32,7 @@ dummy:
 #  pacific: 16
 #  quincy: 17
 #  reef: 18
+#  squid: 19
 #  dev: 99
 
 
@@ -128,7 +129,7 @@ dummy:
 # ORIGIN SOURCE
 #
 # Choose between:
-# - 'repository' means that you will get ceph installed through a new repository. Later below choose between 'community', 'rhcs', 'dev' or 'obs'
+# - 'repository' means that you will get ceph installed through a new repository. Later below choose between 'community', 'dev' or 'obs'
 # - 'distro' means that no separate repo file will be added
 #  you will get whatever version of Ceph is included in your Linux distro.
 # 'local' means that the ceph binaries will be copied over from the local machine
@@ -142,7 +143,6 @@ dummy:
 #ceph_repository: dummy
 #valid_ceph_repository:
 #  - community
-#  - rhcs
 #  - dev
 #  - uca
 #  - custom
@@ -170,16 +170,6 @@ dummy:
 # for more info read: https://github.com/ceph/ceph-ansible/issues/305
 # ceph_stable_distro_source: "{{ ansible_facts['distribution_release'] }}"
 
-
-# REPOSITORY: RHCS VERSION RED HAT STORAGE (from 5.0)
-#
-# Enabled when ceph_repository == 'rhcs'
-#
-# This version is supported on RHEL 8
-#
-#ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(5) }}"
-
-
 # REPOSITORY: UBUNTU CLOUD ARCHIVE
 #
 # Enabled when ceph_repository == 'uca'