rhcs: remove ISO install method

Starting RHCS 5, there's no ISO available anymore. This removes all ISO variables and the ceph_repository_type variable. Closes: #6626 Signed-off-by: Dimitri Savineau <dsavinea@redhat.com> (cherry picked from commit a05730b)
ceph · Jun 30, 2021 · 48f47e7 · 48f47e7
1 parent 5b18429
commit 48f47e7
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 128 deletions.
diff --git a/docs/source/installation/non-containerized.rst b/docs/source/installation/non-containerized.rst
@@ -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
@@ -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

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
@@ -109,8 +109,6 @@ dummy:
 ###########
 # INSTALL #
 ###########
-#ceph_repository_type: dummy
-
 # ORIGIN SOURCE
 #
 # Choose between:
@@ -162,12 +160,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

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
@@ -109,8 +109,6 @@ dummy:
 ###########
 # INSTALL #
 ###########
-#ceph_repository_type: dummy
-
 # ORIGIN SOURCE
 #
 # Choose between:
@@ -162,12 +160,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

diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
@@ -828,11 +828,6 @@
     command: dnf clean all
     when: ansible_facts['pkg_mgr'] == 'dnf'
 
-  - name: purge rpm cache in /tmp
-    file:
-      path: /tmp/rh-storage-repo
-      state: absent
-
   - name: clean apt
     command: apt-get clean  # noqa 303
     when: ansible_facts['pkg_mgr'] == 'apt'
@@ -844,7 +839,6 @@
     with_items:
       - ceph-dev
       - ceph_stable
-      - rh_storage
     when: ansible_facts['os_family'] == 'RedHat'
 
   - name: check for anything running ceph

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
@@ -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: block upgrade if nfs+rgw deployed

diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_iso_install.yml
diff --git a/roles/ceph-common/tasks/installs/redhat_rhcs_repository.yml b/roles/ceph-common/tasks/installs/redhat_rhcs_repository.yml
@@ -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'
diff --git a/roles/ceph-common/templates/redhat_storage_repo.j2 b/roles/ceph-common/templates/redhat_storage_repo.j2
diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
@@ -101,8 +101,6 @@ ceph_directories_mode: "0755"
 ###########
 # INSTALL #
 ###########
-ceph_repository_type: dummy
-
 # ORIGIN SOURCE
 #
 # Choose between:
@@ -154,12 +152,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

diff --git a/roles/ceph-validate/tasks/check_system.yml b/roles/ceph-validate/tasks/check_system.yml
@@ -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

diff --git a/roles/ceph-validate/tasks/main.yml b/roles/ceph-validate/tasks/main.yml
@@ -25,14 +25,6 @@
         - ceph_repository == 'community'
         - ceph_stable_release not in ['pacific']
 
-    - 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'"