Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drop rhcs references #7477

Merged
merged 1 commit into from
Feb 16, 2024
Merged

drop rhcs references #7477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions ceph-ansible.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion docs/source/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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``

Expand Down
10 changes: 1 addition & 9 deletions docs/source/installation/non-containerized.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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
Expand All @@ -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
~~~~~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion docs/source/testing/tox.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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``.
10 changes: 1 addition & 9 deletions generate_group_vars_sample.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 #
########
Expand All @@ -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
Expand All @@ -82,5 +76,3 @@ for role in "$basedir"/roles/ceph-*; do
generate_group_vars_file
fi
done

rhcs_edits
14 changes: 2 additions & 12 deletions group_vars/all.yml.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dummy:
# pacific: 16
# quincy: 17
# reef: 18
# squid: 19
# dev: 99


Expand Down Expand Up @@ -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
Expand All @@ -142,7 +143,6 @@ dummy:
#ceph_repository: dummy
#valid_ceph_repository:
# - community
# - rhcs
# - dev
# - uca
# - custom
Expand Down Expand Up @@ -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'
Expand Down
Loading
Loading