Support strict variables with puppet v4

ghoneycutt · ghoneycutt · commit 07a33caa8466 · 2016-08-23T18:04:05.000-04:00
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -190,9 +190,10 @@
 
         $virtualenv_package = "${python}-virtualenv"
       } else {
-        $virtualenv_package = $::lsbdistcodename ? {
-          'jessie' => 'virtualenv',
-          default  => 'python-virtualenv',
+        if $::lsbdistcodename == 'jessie' {
+          $virtualenv_package = 'virtualenv'
+        } else {
+          $virtualenv_package = 'python-virtualenv'
         }
       }
 
diff --git a/manifests/pyvenv.pp b/manifests/pyvenv.pp
@@ -59,6 +59,8 @@
   $environment      = [],
 ) {
 
+  include ::python
+
   if $ensure == 'present' {
 
     $virtualenv_cmd = $version ? {
diff --git a/spec/classes/python_spec.rb b/spec/classes/python_spec.rb
@@ -187,6 +187,7 @@
       {
         :id => 'root',
         :kernel => 'Linux',
+        :lsbdistcodename => nil,
         :osfamily => 'Suse',
         :operatingsystem => 'SLES',
         :operatingsystemrelease => '11.3',
diff --git a/spec/defines/pyvenv_spec.rb b/spec/defines/pyvenv_spec.rb
@@ -2,6 +2,12 @@
 
 describe 'python::pyvenv', :type => :define do
   let (:title) { '/opt/env' }
+  let (:facts) do
+    {
+      :lsbdistcodename => 'jessie',
+      :osfamily => 'Debian',
+    }
+  end
 
   it {
     is_expected.to contain_file( '/opt/env')

Original file line number	Diff line number	Diff line change
`@@ -190,9 +190,10 @@`
`190`	`190`
`191`	`191`	`$virtualenv_package = "${python}-virtualenv"`
`192`	`192`	`} else {`
`193`		`- $virtualenv_package = $::lsbdistcodename ? {`
`194`		`- 'jessie' => 'virtualenv',`
`195`		`- default => 'python-virtualenv',`
	`193`	`+ if $::lsbdistcodename == 'jessie' {`
	`194`	`+ $virtualenv_package = 'virtualenv'`
	`195`	`+ } else {`
	`196`	`+ $virtualenv_package = 'python-virtualenv'`
`196`	`197`	`}`
`197`	`198`	`}`
`198`	`199`