common: Set releasever on testnodes sooner

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/common/tasks/rhel-entitlements.yml b/roles/common/tasks/rhel-entitlements.yml
index 7b31036a2c661f0007cd67a640d10abfc8b6ad04..b1765cfee8f26f4c1030c40ddf7613f431759e41 100644 (file)
--- a/roles/common/tasks/rhel-entitlements.yml
+++ b/roles/common/tasks/rhel-entitlements.yml
@@ -25,6 +25,16 @@
     validate_certs: no
   when: use_satellite == true
 
+# set the releasever cause without it rhel-7-server-rpms repo fails on rhel7.9 machines
+# https://tracker.ceph.com/issues/49771
+# We have to do this here (instead of in testnodes role) because some package transactions fail during the common role.
+# However, we do not want to lock the release ver on all our systems; just testnodes.
+- name: Set the releasever
+  copy:
+    content: "{{ ansible_lsb.release }}"
+    dest: /etc/yum/vars/releasever
+  when: inventory_hostname in groups['testnodes']
+
 - name: Determine if node is registered with subscription-manager.
   command: subscription-manager identity
   register: subscription

diff --git a/roles/testnode/tasks/yum/repos.yml b/roles/testnode/tasks/yum/repos.yml
index f8688599f6ace590ba6d1f4696801a4ab13ba5f6..278d8d7f6ed0261d899bf7a61adc74d3b42429b8 100644 (file)
--- a/roles/testnode/tasks/yum/repos.yml
+++ b/roles/testnode/tasks/yum/repos.yml
@@ -48,10 +48,3 @@
   when: (repo_file is defined and repo_file is changed) or
         (gpg_keys is defined and gpg_keys is changed) or
         (version_repo_file is defined and version_repo_file is changed)
-
-# set the releasever cause without it rhel-7-server-rpms repo fails on rhel7.9 machines https://tracker.ceph.com/issues/49771
-- name: set the releasevar on rhel
-  copy:
-    content: "{{ ansible_lsb.release }}"
-    dest: /etc/yum/vars/releasever
-  when: ansible_distribution == "RedHat"