From f708e36b94b86d50a7a710d85b5f8c61c04069d3 Mon Sep 17 00:00:00 2001
From: "Gareth J. Greenaway" <gareth@saltstack.com>
Date: Mon, 1 Aug 2022 10:46:26 -0700
Subject: [PATCH] fixing the GPG_KEY path for rhel, onedir does not need a
 special path for centos 7.

---
 bootstrap-salt.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index cab0dbf..29eddff 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4464,11 +4464,7 @@ __install_saltstack_rhel_onedir_repository() {
     # Avoid using '$releasever' variable for yum.
     # Instead, this should work correctly on all RHEL variants.
     base_url="${HTTP_VAL}://${_REPO_URL}/${_ONEDIR_DIR}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${ONEDIR_REV}/"
-    if [ "${DISTRO_MAJOR_VERSION}" -eq 7 ]; then
-        gpg_key="SALTSTACK-GPG-KEY.pub base/RPM-GPG-KEY-CentOS-7"
-    else
-        gpg_key="SALTSTACK-GPG-KEY.pub"
-    fi
+    gpg_key="SALTSTACK-GPG-KEY.pub"
 
     gpg_key_urls=""
     for key in $gpg_key; do