updated repo URL for RHEL

NTTCom-MS · Jun 25, 2021 · aa5daea · aa5daea
1 parent 3c03e47
commit aa5daea
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.2.4
+
+* fix for RHEL repository URL to get major version from facts as Salstack removed the folders $(majorrelease)Server
+
 ## 0.2.3
 
 * bugfix repo GPG key for RHEL8

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -68,11 +68,11 @@
       # gpgkey=https://repo.saltstack.com/yum/redhat/7/$basearch/archive/3000.3/SALTSTACK-GPG-KEY.pub
 
       yumrepo { 'saltstack-repo':
-        baseurl  => "${protocol}://${salt_repo_url}/${base_yum_repo}/redhat/\$releasever/\$basearch/${composite_version}",
+        baseurl  => "${protocol}://${salt_repo_url}/${base_yum_repo}/redhat/${::operatingsystemmajrelease}/\$basearch/${composite_version}",
         descr    => "SaltStack repo - ${version} ${version_minor}",
         enabled  => '1',
         gpgcheck => '1',
-        gpgkey   => "${protocol}://${salt_repo_url}/${base_yum_repo}/redhat/\$releasever/\$basearch/${composite_version}/${gpg_key}",
+        gpgkey   => "${protocol}://${salt_repo_url}/${base_yum_repo}/redhat/${::operatingsystemmajrelease}/\$basearch/${composite_version}/${gpg_key}",
       }
     }
     'Debian':

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "eyp-saltstack",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "author": "eyp",
   "summary": "saltstack - minion, master, api, cloud, syndic and ssh setup and configuration",
   "license": "Apache-2.0",