Merge pull request #1056 from puppetlabs/gh-1055-hardcoded_cache_path

(GH-1055) Fix hardcoded cache path
puppetlabs · Aug 31, 2022 · 65e0324 · 65e0324
2 parents dad7d73 + 58265f3
commit 65e0324
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/manifests/ppa.pp b/manifests/ppa.pp
@@ -67,8 +67,9 @@
     $trusted_gpg_d_filename = "${dash_filename_no_specialchars}.gpg"
   }
 
-  # This is the location of our main exec script  
-  $script_path = "/opt/puppetlabs/puppet/cache/add-apt-repository-${dash_filename_no_specialchars}-${release}.sh"
+  # This is the location of our main exec script.
+  $cache_path = $facts['puppet_vardir']
+  $script_path = "${cache_path}/add-apt-repository-${dash_filename_no_specialchars}-${release}.sh"
 
   if $ensure == 'present' {
     if $package_manage {

diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb
@@ -30,6 +30,7 @@ def ppa_exec_params(user, repo, distro = 'trusty', environment = [])
             id: 'Ubuntu',
           },
         },
+        puppet_vardir: '/opt/puppetlabs/puppet/cache'
       }
     end
 
@@ -58,6 +59,7 @@ def ppa_exec_params(user, repo, distro = 'trusty', environment = [])
             id: 'Ubuntu',
           },
         },
+        puppet_vardir: '/opt/puppetlabs/puppet/cache',
       }
     end
 
@@ -96,6 +98,7 @@ def ppa_exec_params(user, repo, distro = 'trusty', environment = [])
             id: 'Ubuntu',
           },
         },
+        puppet_vardir: '/opt/puppetlabs/puppet/cache',
       }
     end
 
@@ -128,6 +131,7 @@ def ppa_exec_params(user, repo, distro = 'trusty', environment = [])
             id: 'Ubuntu',
           },
         },
+        puppet_vardir: '/opt/puppetlabs/puppet/cache',
       }
     end
 
@@ -168,6 +172,7 @@ def ppa_exec_params(user, repo, distro = 'trusty', environment = [])
             id: 'Ubuntu',
           },
         },
+        puppet_vardir: '/opt/puppetlabs/puppet/cache',
       }
     end
 
@@ -210,6 +215,7 @@ def ppa_exec_params(user, repo, distro = 'trusty', environment = [])
             id: 'Ubuntu',
           },
         },
+        puppet_vardir: '/opt/puppetlabs/puppet/cache',
       }
     end
 
@@ -250,6 +256,7 @@ def ppa_exec_params(user, repo, distro = 'trusty', environment = [])
             id: 'Ubuntu',
           },
         },
+        puppet_vardir: '/opt/puppetlabs/puppet/cache',
       }
     end
 
@@ -290,6 +297,7 @@ def ppa_exec_params(user, repo, distro = 'trusty', environment = [])
             id: 'Ubuntu',
           },
         },
+        puppet_vardir: '/opt/puppetlabs/puppet/cache',
       }
     end
 
@@ -328,6 +336,7 @@ def ppa_exec_params(user, repo, distro = 'trusty', environment = [])
             id: 'Ubuntu',
           },
         },
+        puppet_vardir: '/opt/puppetlabs/puppet/cache',
       }
     end