saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add CentOS GPG key for RHEL7 for successful builds

Browse source
This commit is contained in:
Jeff Neel 2020-12-23 16:46:01 -06:00 • committed by Pedro Algarvio
parent 68d22715a0
commit 098a08950d
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bootstrap-salt.sh
View file

@ -4120,7 +4120,11 @@ __install_saltstack_rhel_repository() {
# Avoid using '$releasever' variable for yum. # Avoid using '$releasever' variable for yum.
# Instead, this should work correctly on all RHEL variants. # 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}/" base_url="${HTTP_VAL}://${_REPO_URL}/${__PY_VERSION_REPO}/redhat/${DISTRO_MAJOR_VERSION}/\$basearch/${repo_rev}/"
gpg_key="SALTSTACK-GPG-KEY.pub" if [ "${DISTRO_MAJOR_VERSION}" -eq 7 ]; then
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub","${base_url}base/RPM-GPG-KEY-CentOS-7"
else
gpg_key="${base_url}SALTSTACK-GPG-KEY.pub"
fi
repo_file="/etc/yum.repos.d/salt.repo" repo_file="/etc/yum.repos.d/salt.repo"
if [ ! -s "$repo_file" ] || [ "$_FORCE_OVERWRITE" -eq $BS_TRUE ]; then if [ ! -s "$repo_file" ] || [ "$_FORCE_OVERWRITE" -eq $BS_TRUE ]; then
@ -4130,7 +4134,7 @@ name=SaltStack ${repo_rev} Release Channel for RHEL/CentOS \$releasever
baseurl=${base_url} baseurl=${base_url}
skip_if_unavailable=True skip_if_unavailable=True
gpgcheck=1 gpgcheck=1
gpgkey=${base_url}${gpg_key} gpgkey=${gpg_key}
enabled=1 enabled=1
enabled_metadata=1 enabled_metadata=1
_eof _eof