Skip to content

Commit

Permalink
rhcs: remove ISO install method
Browse files Browse the repository at this point in the history
Staring RHCS 5, there's no ISO available anymore.
This removes all ISO variables and the ceph_repository_type variable.

Closes: ceph#6626

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
  • Loading branch information
dsavineau committed Jun 28, 2021
1 parent 793d529 commit ca05e0b
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 101 deletions.
3 changes: 1 addition & 2 deletions docs/source/installation/non-containerized.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ 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, additionally you will have to select a repository type through ``ceph_repository_type`` (``cdn`` or ``iso``)
- ``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 @@ -33,7 +33,6 @@ 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.

Additionally you will have to select a repository type through ``ceph_repository_type``, it can be ``cdn`` or ``iso``.
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
8 changes: 0 additions & 8 deletions group_vars/all.yml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,6 @@ dummy:
###########
# INSTALL #
###########
#ceph_repository_type: dummy

# ORIGIN SOURCE
#
# Choose between:
Expand Down Expand Up @@ -163,12 +161,6 @@ dummy:
# This version is supported on RHEL 8
#
#ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(5) }}"
#valid_ceph_repository_type:
# - cdn
# - iso
#ceph_rhcs_iso_path: "{{ ceph_stable_rh_storage_iso_path | default('') }}"
#ceph_rhcs_mount_path: "{{ ceph_stable_rh_storage_mount_path | default('/tmp/rh-storage-mount') }}"
#ceph_rhcs_repository_path: "{{ ceph_stable_rh_storage_repository_path | default('/tmp/rh-storage-repo') }}" # where to copy iso's content


# REPOSITORY: UBUNTU CLOUD ARCHIVE
Expand Down
8 changes: 0 additions & 8 deletions group_vars/rhcs.yml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,6 @@ dummy:
###########
# INSTALL #
###########
#ceph_repository_type: dummy

# ORIGIN SOURCE
#
# Choose between:
Expand Down Expand Up @@ -163,12 +161,6 @@ ceph_repository: rhcs
# This version is supported on RHEL 8
#
ceph_rhcs_version: 5
#valid_ceph_repository_type:
# - cdn
# - iso
#ceph_rhcs_iso_path: "{{ ceph_stable_rh_storage_iso_path | default('') }}"
#ceph_rhcs_mount_path: "{{ ceph_stable_rh_storage_mount_path | default('/tmp/rh-storage-mount') }}"
#ceph_rhcs_repository_path: "{{ ceph_stable_rh_storage_repository_path | default('/tmp/rh-storage-repo') }}" # where to copy iso's content


# REPOSITORY: UBUNTU CLOUD ARCHIVE
Expand Down
4 changes: 1 addition & 3 deletions infrastructure-playbooks/rolling_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
#
# If you run a Ceph community version, you have to change the variable: ceph_stable_release to the new release
#
# If you run Red Hat Ceph Storage and are doing a **major** update (e.g: from 2 to 3), you have two options:
# - if you use a CDN, you have to change the ceph_rhcs_version to a newer one
# - if you use an ISO, you have to change the ceph_rhcs_iso_path to the directory containing the new Ceph version
# If you run Red Hat Ceph Storage and are doing a **major** update (e.g: from 2 to 3), you have to change the ceph_rhcs_version to a newer one
#

- name: confirm whether user really meant to upgrade the cluster
Expand Down
58 changes: 0 additions & 58 deletions roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install.yml

This file was deleted.

5 changes: 0 additions & 5 deletions roles/ceph-common/tasks/installs/redhat_rhcs_repository.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
---
- name: include prerequisite_rhcs_iso_install.yml
include_tasks: prerequisite_rhcs_iso_install.yml
when: ceph_repository_type == 'iso'

- name: include prerequisite_rhcs_cdn_install.yml
include_tasks: prerequisite_rhcs_cdn_install.yml
when: ceph_repository_type == 'cdn'
8 changes: 0 additions & 8 deletions roles/ceph-defaults/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,6 @@ ceph_directories_mode: "0755"
###########
# INSTALL #
###########
ceph_repository_type: dummy

# ORIGIN SOURCE
#
# Choose between:
Expand Down Expand Up @@ -155,12 +153,6 @@ nfs_ganesha_stable_deb_repo: "{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_s
# This version is supported on RHEL 8
#
ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(5) }}"
valid_ceph_repository_type:
- cdn
- iso
ceph_rhcs_iso_path: "{{ ceph_stable_rh_storage_iso_path | default('') }}"
ceph_rhcs_mount_path: "{{ ceph_stable_rh_storage_mount_path | default('/tmp/rh-storage-mount') }}"
ceph_rhcs_repository_path: "{{ ceph_stable_rh_storage_repository_path | default('/tmp/rh-storage-repo') }}" # where to copy iso's content


# REPOSITORY: UBUNTU CLOUD ARCHIVE
Expand Down
1 change: 0 additions & 1 deletion roles/ceph-validate/tasks/check_system.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
when: ansible_facts['distribution_version'] is version('8.2', '<')

- name: subscription manager related tasks
when: ceph_repository_type == 'cdn'
block:
- name: determine if node is registered with subscription-manager
command: subscription-manager identity
Expand Down
8 changes: 0 additions & 8 deletions roles/ceph-validate/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,6 @@
- ceph_repository == 'community'
- ceph_stable_release not in ['quincy']

- name: validate ceph_repository_type
fail:
msg: "ceph_repository_type must be either 'cdn' or 'iso'"
when:
- ceph_origin == 'repository'
- ceph_repository == 'rhcs'
- ceph_repository_type not in ['cdn', 'iso']

- name: validate osd_objectstore
fail:
msg: "osd_objectstore must be either 'bluestore' or 'filestore'"
Expand Down

0 comments on commit ca05e0b

Please sign in to comment.