move desc and baseurl into yum class, they are not used otherwise

voxpupuli · Oct 28, 2023 · 2f7c55e · 2f7c55e
1 parent 4ed632a
commit 2f7c55e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/manifests/repo/nodesource.pp b/manifests/repo/nodesource.pp
@@ -10,10 +10,6 @@
 
   case $facts['os']['family'] {
     'RedHat': {
-      # nodesource repo
-      $descr   = "Node.js Packages - \$basearch"
-      $baseurl = "https://rpm.nodesource.com/pub_${url_suffix}/nodistro/nodejs/\$basearch"
-
       contain 'nodejs::repo::nodesource::yum'
     }
     'Debian': {

diff --git a/manifests/repo/nodesource/yum.pp b/manifests/repo/nodesource/yum.pp
@@ -1,12 +1,12 @@
 # PRIVATE CLASS: Do not use directly.
 class nodejs::repo::nodesource::yum {
-  $baseurl        = $nodejs::repo::nodesource::baseurl
   $descr          = $nodejs::repo::nodesource::descr
   $ensure         = $nodejs::repo::nodesource::ensure
   $priority       = $nodejs::repo::nodesource::priority
   $proxy          = $nodejs::repo::nodesource::proxy
   $proxy_password = $nodejs::repo::nodesource::proxy_password
   $proxy_username = $nodejs::repo::nodesource::proxy_username
+  $url_suffix     = $nodejs::repo::nodesource::url_suffix
 
   $yum_failovermethod = (versioncmp($facts['os']['release']['major'], '8') >= 0 and $priority == 'absent') ? {
     true    => 'absent',
@@ -38,8 +38,8 @@
     # FIXME: REMOVE ABOVE HACK
 
     yumrepo { 'nodesource':
-      descr           => $descr,
-      baseurl         => $baseurl,
+      descr           => 'Node.js Packages - \$basearch',
+      baseurl         => "https://rpm.nodesource.com/pub_${url_suffix}/nodistro/nodejs/\$basearch",
       enabled         => '1',
       failovermethod  => $yum_failovermethod,
       gpgkey          => 'file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL',