common: remove RHEL beta handling

Now that mainly care about containers and we test against CentOS Stream,
there's almost no value in testing Ceph with RHEL Beta content.

The rhel-entitlements.yml playbook is very complicated, and dropping
this feature will make it easier to simply and refactor further.

diff --git a/roles/common/README.rst b/roles/common/README.rst
index 245438e5915f4d714f49f03aee4ab3e9b167018e..4646df1fefd2cca7129df49efc4626154c710518 100644 (file)
--- a/roles/common/README.rst
+++ b/roles/common/README.rst
@@ -49,8 +49,6 @@ your own local epel mirror.
 ``enable_epel`` is a boolean that sets whether epel repos should be enabled.
 Defined in ``roles/common/defaults/main.yml``.
 
-``beta_repos`` is a dict of internal Red Hat beta repos used to create repo files in /etc/yum.repos.d.  We have these defined in the secrets repo.  See ``epel_repos`` for dict syntax.
-
 ``yum_timeout`` is an integer used to set the yum timeout.  Defined in
 ``roles/common/defaults/main.yml``.
 

diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml
index 6384886fa65d3f2e1fa4b7b25ec9c9f3ec2dbf47..c29513ed4fbdffc53edc3f01c524ec8d4b4da112 100644 (file)
--- a/roles/common/defaults/main.yml
+++ b/roles/common/defaults/main.yml
@@ -27,13 +27,6 @@ epel_repos:
     enabled: 0
     gpgcheck: 0
 
-# Override in secrets repo
-beta_repos: {}
-
-# Default to false.  A task in roles/common/tasks/yum_systems.yml
-# will set this to true if lsb_release indicates the distro is an Alpha/Beta release
-beta_distro: false
-
 enable_epel: true
 yum_timeout: 300
 

diff --git a/roles/common/tasks/beta_repos.yml b/roles/common/tasks/beta_repos.yml
deleted file mode 100644 (file)
index fec8574..0000000
--- a/roles/common/tasks/beta_repos.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Configure internal beta repos in /etc/yum.repos.d/
-  template:
-    src: yum_repo.j2
-    dest: /etc/yum.repos.d/{{ item.key }}.repo
-    owner: root
-    group: root
-    mode: 0644
-  register: beta_repo
-  with_dict: "{{ beta_repos }}"
-  no_log: true
-
-- name: Clean yum cache
-  shell: yum clean all
-  when: beta_repo is defined and beta_repo is changed

diff --git a/roles/common/tasks/rhel-entitlements.yml b/roles/common/tasks/rhel-entitlements.yml
index 148690d5eb7869020bb70c02fada078525e93bed..bfeb2267a09229fa6e33ddd0b559d84173039652 100644 (file)
--- a/roles/common/tasks/rhel-entitlements.yml
+++ b/roles/common/tasks/rhel-entitlements.yml
@@ -120,7 +120,6 @@
   delay: 10
   failed_when:
     - entitled.rc != 0
-    - '"Beta" not in ansible_lsb.description'
 
 - name: Set rhsm_registered if we just registered
   set_fact:
@@ -137,29 +136,6 @@
   changed_when: false
   failed_when:
     - rhsm_release_list.rc != 0
-    - ansible_lsb.description is defined
-    - '"Beta" not in ansible_lsb.description'
-
-# We don't need to be registered to CDN since there's no packages available
-# for this Beta/Alpha/RC installation
-- name: Unregister Beta/Alpha/RC system with subscription-manager
-  command: subscription-manager unregister
-  when: ansible_distribution_version not in rhsm_release_list.stdout_lines
-  register: unregistered_beta_distro
-  until: unregistered_beta_distro is success
-  retries: 5
-  delay: 10
-
-# Setting rhsm_registered back to false allows the rest of the playbook
-# (except beta_repos.yml) to be skipped
-- name: Set rhsm_registered to false if Beta/Alpha/RC release
-  set_fact:
-    rhsm_registered: false
-  when: unregistered_beta_distro is not skipped
-
-- name: Run beta_repos.yml playbook for Beta/Alpha/RC release
-  import_tasks: beta_repos.yml
-  when: ansible_distribution_version not in rhsm_release_list.stdout_lines
 
 - name: Get list of enabled RHSM repos
   shell: subscription-manager repos --list | grep -B4 'Enabled:.*1' | grep 'Repo ID:' | sed -e 's/Repo ID:\s*\(.*\)/\1/' | sort
@@ -172,10 +148,10 @@
     repo_list: "{{ repo_list_cmd.stdout.split('\n') }}"
   when: repo_list_cmd is defined and repo_list_cmd is not skipped
 
-- name: Set replace_repos false if entitlements are missing or if we unregistered
+- name: Set replace_repos false if entitlements are missing
   set_fact:
     replace_repos: false
-  when: have_entitlements == false or unregistered_beta_distro is changed
+  when: have_entitlements == false
 
 - name: Set replace_repos true if rhsm_repos differs from repo_list
   set_fact:

diff --git a/roles/common/tasks/yum_systems.yml b/roles/common/tasks/yum_systems.yml
index f424174c86d03a6c64eb44daa6677f2203301d36..26addd1bd95715b8a2bbab97a5c0495a6c8d7cb8 100644 (file)
--- a/roles/common/tasks/yum_systems.yml
+++ b/roles/common/tasks/yum_systems.yml
@@ -65,7 +65,6 @@
 - import_tasks: rhel-entitlements.yml
   when:
     ansible_distribution == 'RedHat' and
-    beta_distro == false and
     skip_entitlements|default(false)|bool != true
   tags:
     - entitlements