From 3b43309236cb668b2abf82da6108558890ecb135 Mon Sep 17 00:00:00 2001
From: Jeff  Neel <10672501+jeff350@users.noreply.github.com>
Date: Thu, 24 Dec 2020 12:00:40 -0600
Subject: [PATCH] fix fetch url

---
 bootstrap-salt.sh | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index a4d3e48..1b426d3 100644
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -4121,10 +4121,19 @@ __install_saltstack_rhel_repository() {
     # Instead, this should work correctly on all RHEL variants.
     base_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${repo_rev}/"
     if [ "${DISTRO_MAJOR_VERSION}" -eq 7 ]; then
-        gpg_key="${base_url}SALTSTACK-GPG-KEY.pub,${base_url}base/RPM-GPG-KEY-CentOS-7"
+        gpg_key="SALTSTACK-GPG-KEY.pub,base/RPM-GPG-KEY-CentOS-7"
     else
-        gpg_key="${base_url}SALTSTACK-GPG-KEY.pub"
+        gpg_key="SALTSTACK-GPG-KEY.pub"
     fi
+
+    Field_Separator=$IFS
+    IFS=,
+    gpg_key_urls=""
+    for key in $gpg_key; do
+	gpg_key_urls+="${base_url}${key},"
+    done
+    IFS=$Field_Separator
+
     repo_file="/etc/yum.repos.d/salt.repo"
 
     if [ ! -s "$repo_file" ] || [ "$_FORCE_OVERWRITE" -eq $BS_TRUE ]; then
@@ -4134,17 +4143,19 @@ name=SaltStack ${repo_rev} Release Channel for RHEL/CentOS \$releasever
 baseurl=${base_url}
 skip_if_unavailable=True
 gpgcheck=1
-gpgkey=${gpg_key}
+gpgkey=${gpg_key_urls}
 enabled=1
 enabled_metadata=1
 _eof
 
+        fetch_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${repo_rev}/"
 	Field_Separator=$IFS
 	IFS=,
 	for key in $gpg_key; do
-            __rpm_import_gpg "$key" || return 1
+            __rpm_import_gpg "${fetch_url}${key}" || return 1
         done
 	IFS=$Field_Separator
+
         yum clean metadata || return 1
     elif [ "$repo_rev" != "latest" ]; then
         echowarn "salt.repo already exists, ignoring salt version argument."