Fix scoping issues to allow for strict vars

voxpupuli · Apr 13, 2016 · a421a19 · a421a19
1 parent e393013
commit a421a19
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/manifests/requirements.pp b/manifests/requirements.pp
@@ -80,6 +80,8 @@
   $timeout                = 1800,
 ) {
 
+  include ::python
+
   if $virtualenv == 'system' and ($owner != 'root' or $group != 'root') {
     fail('python::pip: root user must be used when virtualenv is system')
   }
@@ -98,8 +100,8 @@
   }
 
   $pip_env = $virtualenv ? {
-    'system' => "${python::exec_prefix} pip",
-    default  => "${python::exec_prefix} ${virtualenv}/bin/pip",
+    'system' => "${::python::exec_prefix} pip",
+    default  => "${::python::exec_prefix} ${virtualenv}/bin/pip",
   }
 
   $proxy_flag = $proxy ? {
@@ -136,5 +138,4 @@
     subscribe   => File[$requirements],
     environment => $environment,
   }
-
 }