Rolling back some bad/unnecessary changes

rancherfederal · Oct 2, 2023 · 96747e4 · 96747e4
1 parent 9de6b30
commit 96747e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/ansible.cfg b/ansible.cfg
@@ -1,7 +1,7 @@
 [defaults]
 nocows = True
 roles_path = ./roles
-inventory  = ./inventory/hosts.ini
+inventory  = ./inventory/my-cluster/hosts.ini
 
 remote_tmp = $HOME/.ansible/tmp
 local_tmp  = $HOME/.ansible/tmp

diff --git a/roles/rke2_common/tasks/rpm_install.yml b/roles/rke2_common/tasks/rpm_install.yml
@@ -15,17 +15,10 @@
     gpgcheck: "{{ rke2_common_yum_repo.gpgcheck }}"
     gpgkey: "{{ rke2_common_yum_repo.gpgkey }}"
     enabled: "{{ rke2_common_yum_repo.enabled }}"
-  when: not stat_rke2_common_repo.stat.exists and ansible_lsb.major_release == '7'
-
-- name: Add the rke2-common repo RHEL/CentOS 8
-  ansible.builtin.yum_repository:
-    name: "{{ rke2_common_yum_repo.name }}"
-    description: "{{ rke2_common_yum_repo.description }}"
-    baseurl: "{{ rke2_common_yum_repo.baseurl }}"
-    gpgcheck: "{{ rke2_common_yum_repo.gpgcheck }}"
-    gpgkey: "{{ rke2_common_yum_repo.gpgkey }}"
-    enabled: "{{ rke2_common_yum_repo.enabled }}"
-  when: not stat_rke2_common_repo.stat.exists and ansible_lsb.major_release == '8'
+  when:
+    - not stat_rke2_common_repo.stat.exists
+    - ansible_facts['os_family'] == "RedHat" or ansible_facts['os_family'] == "Rocky"
+    - ansible_facts['distribution_major_version'] == "7" or ansible_facts['distribution_major_version'] == "8"
 
 # Does the Rancher RKE2 versioned repo exist already
 - name: Check to see if rke2 versioned repo exists
@@ -63,4 +56,4 @@
   when:
     - ansible_facts['os_family'] == 'RedHat' or ansible_facts['os_family'] == 'Rocky'
     - not rke2_binary_tarball_check.stat.exists
-    - inventory_hostname in groups.get('rke2_agents', [])
+    - inventory_hostname in groups.get('rke2_agents', [])