Merge pull request #35 from mherrre/master

Adding salt_repo_url support for Debian
NTTCom-MS · Dec 10, 2021 · dd45a2a · dd45a2a
2 parents aa5daea + c240ac5
commit dd45a2a
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.5
+
+* Adding saltstack::repo::salt_repo_url support for Debian based
+
 ## 0.2.4
 
 * fix for RHEL repository URL to get major version from facts as Salstack removed the folders $(majorrelease)Server

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -84,12 +84,12 @@
 
       apt::key { 'SALTSTACK-GPG-KEY':
         key        => 'C7A3D3EE96D9220BAE9420246DF2C88E747F3421',
-        key_source => "${protocol}://repo.saltstack.com/${base_yum_repo}/${saltstack::params::repo_path}/amd64/${composite_version}/SALTSTACK-GPG-KEY.pub",
+        key_source => "${protocol}://${salt_repo_url}/${base_yum_repo}/${saltstack::params::repo_path}/amd64/${composite_version}/SALTSTACK-GPG-KEY.pub",
       }
 
       # deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main
       apt::source { 'saltstack':
-        location => "${protocol}://repo.saltstack.com/${base_yum_repo}/${saltstack::params::repo_path}/amd64/${composite_version}",
+        location => "${protocol}://${salt_repo_url}/${base_yum_repo}/${saltstack::params::repo_path}/amd64/${composite_version}",
         release  => $facts['os']['distro']['codename'],
         repos    => 'main',
         require  => Apt::Key['SALTSTACK-GPG-KEY'],

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