From c48c36c40e28839b8be48f996b102440bfcf0b1c Mon Sep 17 00:00:00 2001
From: Denys Havrysh <Denys.Gavrysh@gmail.com>
Date: Fri, 5 May 2017 11:56:27 +0300
Subject: [PATCH 1/2] Fix #1067: remove `$releasever` from repo URL for RHEL
 variants

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

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index fc7fa87..8648721 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -1539,7 +1539,6 @@ if [ "${DISTRO_NAME_L}" = "ubuntu" ]; then
 fi
 
 
-
 #---  FUNCTION  -------------------------------------------------------------------------------------------------------
 #          NAME:  __function_defined
 #   DESCRIPTION:  Checks if a function is defined within this scripts scope
@@ -3579,14 +3578,9 @@ __install_saltstack_rhel_repository() {
         repo_rev="latest"
     fi
 
-    # Cloud Linux $releasever = 7.x, which doesn't exist in repo.saltstack.com, we need this to be "7"
-    if [ "${DISTRO_NAME}" = "Cloud Linux" ] && [ "${DISTRO_MAJOR_VERSION}" = "7" ]; then
-        base_url="${HTTP_VAL}://${_REPO_URL}/yum/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${repo_rev}/"
-    else
-        base_url="${HTTP_VAL}://${_REPO_URL}/yum/redhat/\$releasever/\$basearch/${repo_rev}/"
-    fi
-
-    fetch_url="${HTTP_VAL}://${_REPO_URL}/yum/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${repo_rev}/"
+    # Avoid using '$releasever' variable for yum.
+    # Instead, this should work correctly on all RHEL variants.
+    base_url="${HTTP_VAL}://${_REPO_URL}/yum/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${repo_rev}/"
 
     if [ "${DISTRO_MAJOR_VERSION}" -eq 5 ]; then
         gpg_key="SALTSTACK-EL5-GPG-KEY.pub"
@@ -3607,6 +3601,7 @@ enabled=1
 enabled_metadata=1
 _eof
 
+        fetch_url="${HTTP_VAL}://${_REPO_URL}/yum/redhat/${DISTRO_MAJOR_VERSION}/${CPU_ARCH_L}/${repo_rev}/"
         __rpm_import_gpg "${fetch_url}${gpg_key}" || return 1
     fi
 
@@ -4478,7 +4473,6 @@ daemons_running_alpine_linux() {
 #
 
 install_amazon_linux_ami_deps() {
-
     # Shim to figure out if we're using old (rhel) or new (aws) rpms.
     _USEAWS=$BS_FALSE
 

From f1a08d0fde6bc70f011291b9a613ca02da5644d5 Mon Sep 17 00:00:00 2001
From: Denys Havrysh <Denys.Gavrysh@gmail.com>
Date: Fri, 5 May 2017 12:02:14 +0300
Subject: [PATCH 2/2] Drop legacy workaround for installing GnuPG pub key

---
 bootstrap-salt.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 8648721..48c8226 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -3605,13 +3605,6 @@ _eof
         __rpm_import_gpg "${fetch_url}${gpg_key}" || return 1
     fi
 
-    if [ "$DISTRO_MAJOR_VERSION" -eq 7 ] && ([ "$repo_rev" = "latest" ] || [ "$repo_rev" = "2015.8" ]); then
-        # Import CentOS 7 GPG key on RHEL for installing base dependencies from
-        # Salt corporate repository
-        rpm -qa gpg-pubkey\* --qf "%{name}-%{version}\n" | grep -q ^gpg-pubkey-f4a80eb5$ || \
-            __rpm_import_gpg "${HTTP_VAL}://${_REPO_URL}/yum/redhat/7/x86_64/${repo_rev}/base/RPM-GPG-KEY-CentOS-7" || return 1
-    fi
-
     return 0
 }