Pass through environment to staging, so we can set a proxy to downloa…

…d tomcat
puppetlabs · Oct 31, 2016 · 3cdb860 · 3cdb860
1 parent b24ba47
commit 3cdb860
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -6,6 +6,7 @@
   # source options
   $source_url             = undef,
   $source_strip_first_dir = true,
+  $environment            = undef,
   $user                   = undef,
   $group                  = undef,
   $manage_user            = undef,
@@ -44,6 +45,7 @@
       manage_home            => $_manage_home,
       source_url             => $source_url,
       source_strip_first_dir => $source_strip_first_dir,
+      environment            => $environment,
       user                   => $_user,
       group                  => $_group,
     }

diff --git a/manifests/install/source.pp b/manifests/install/source.pp
@@ -14,6 +14,7 @@
   $manage_home,
   $source_url,
   $source_strip_first_dir,
+  $environment,
   $user,
   $group,
 ) {
@@ -39,7 +40,8 @@
   }
 
   ensure_resource('staging::file',$filename, {
-    'source' => $source_url,
+    'source'      => $source_url,
+    'environment' => $environment,
   })
 
   # FM-5578 workaround for strict umodes
@@ -53,12 +55,13 @@
   })
 
   staging::extract { "${name}-${filename}":
-    source  => "${::staging::path}/tomcat/${filename}",
-    target  => $catalina_home,
-    require => Staging::File[$filename],
-    unless  => "test -f ${catalina_home}/NOTICE",
-    user    => $user,
-    group   => $group,
-    strip   => $_strip,
+    source      => "${::staging::path}/tomcat/${filename}",
+    target      => $catalina_home,
+    require     => Staging::File[$filename],
+    unless      => "test -f ${catalina_home}/NOTICE",
+    user        => $user,
+    group       => $group,
+    environment => $environment,
+    strip       => $_strip,
   }
 }