init.pp

mkonietzny · mkonietzny · commit d3f315fba649 · 2016-09-08T17:32:45.000+02:00
* fixed bug with puppet 3.8.7/--parser future by using a qualified path name for scl
Error: Validation of Exec[python_requirements_initial_install_...] failed: 'scl enable rh-python34 -- ...' is not qualified and no path was specified. Please qualify the command or specify a path. at /tmp/vagrant-puppet/.../python/manifests/virtualenv.pp:173

install.pp
* added virtualenv specific package for rhscl

 virtualenv.pp
 * fixed version not prepended with "python" - will fail for rhscl (version = "rh-python34" for example)
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -91,8 +91,8 @@
   }
 
   $exec_prefix = $provider ? {
-    'scl'   => "scl enable ${version} -- ",
-    'rhscl' => "scl enable ${version} -- ",
+    'scl'   => "/usr/bin/scl enable ${version} -- ",
+    'rhscl' => "/usr/bin/scl enable ${version} -- ",
     default => '',
   }
 
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -50,7 +50,7 @@
     name   => $python,
   }
 
-  package { 'virtualenv':
+  package { "virtualenv":
     ensure  => $venv_ensure,
     require => Package['python'],
   }
@@ -140,22 +140,24 @@
           provider => 'rpm',
           tag      => 'python-scl-repo',
         }
-        Package <| title == 'python' |> {
+      }
+
+      Package <| title == 'python' |> {
           tag => 'python-scl-package',
         }
+
+      Package <| title == 'virtualenv' |> {
+        name => "${python}-python-virtualenv",
       }
 
       package { "${python}-scldevel":
         ensure => $dev_ensure,
         tag    => 'python-scl-package',
       }
 
-      if $pip_ensure != 'absent' {
-        exec { 'python-scl-pip-install':
-          command => "${python::exec_prefix}easy_install pip",
-          path    => ['/usr/bin', '/bin'],
-          creates => "/opt/rh/${python::version}/root/usr/bin/pip",
-        }
+      package { "${python}-python-pip":
+        ensure => $pip_ensure,
+        tag    => 'python-pip-package',
       }
 
       if $::python::rhscl_use_public_repository {
@@ -164,7 +166,7 @@
       }
 
       Package <| tag == 'python-scl-package' |> ->
-      Exec['python-scl-pip-install']
+      Package <| tag == 'python-pip-package' |>
     }
     default: {
 
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
@@ -93,7 +93,7 @@
     $python = $version ? {
       'system' => 'python',
       'pypy'   => 'pypy',
-      default  => "python${version}",
+      default  => "${version}",
     }
 
     if $virtualenv == undef {

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,8 @@`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`$exec_prefix = $provider ? {`
`94`		`- 'scl' => "scl enable ${version} -- ",`
`95`		`- 'rhscl' => "scl enable ${version} -- ",`
	`94`	`+ 'scl' => "/usr/bin/scl enable ${version} -- ",`
	`95`	`+ 'rhscl' => "/usr/bin/scl enable ${version} -- ",`
`96`	`96`	`default => '',`
`97`	`97`	`}`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`name => $python,`
`51`	`51`	`}`
`52`	`52`
`53`		`- package { 'virtualenv':`
	`53`	`+ package { "virtualenv":`
`54`	`54`	`ensure => $venv_ensure,`
`55`	`55`	`require => Package['python'],`
`56`	`56`	`}`
`@@ -140,22 +140,24 @@`
`140`	`140`	`provider => 'rpm',`
`141`	`141`	`tag => 'python-scl-repo',`
`142`	`142`	`}`
`143`		`- Package <\| title == 'python' \|> {`
	`143`	`+ }`
	`144`	`+`
	`145`	`+ Package <\| title == 'python' \|> {`
`144`	`146`	`tag => 'python-scl-package',`
`145`	`147`	`}`
	`148`	`+`
	`149`	`+ Package <\| title == 'virtualenv' \|> {`
	`150`	`+ name => "${python}-python-virtualenv",`
`146`	`151`	`}`
`147`	`152`
`148`	`153`	`package { "${python}-scldevel":`
`149`	`154`	`ensure => $dev_ensure,`
`150`	`155`	`tag => 'python-scl-package',`
`151`	`156`	`}`
`152`	`157`
`153`		`- if $pip_ensure != 'absent' {`
`154`		`- exec { 'python-scl-pip-install':`
`155`		`- command => "${python::exec_prefix}easy_install pip",`
`156`		`- path => ['/usr/bin', '/bin'],`
`157`		`- creates => "/opt/rh/${python::version}/root/usr/bin/pip",`
`158`		`- }`
	`158`	`+ package { "${python}-python-pip":`
	`159`	`+ ensure => $pip_ensure,`
	`160`	`+ tag => 'python-pip-package',`
`159`	`161`	`}`
`160`	`162`
`161`	`163`	`if $::python::rhscl_use_public_repository {`
`@@ -164,7 +166,7 @@`
`164`	`166`	`}`
`165`	`167`
`166`	`168`	`Package <\| tag == 'python-scl-package' \|> ->`
`167`		`- Exec['python-scl-pip-install']`
	`169`	`+ Package <\| tag == 'python-pip-package' \|>`
`168`	`170`	`}`
`169`	`171`	`default: {`
`170`	`172`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@`
`93`	`93`	`$python = $version ? {`
`94`	`94`	`'system' => 'python',`
`95`	`95`	`'pypy' => 'pypy',`
`96`		`- default => "python${version}",`
	`96`	`+ default => "${version}",`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if $virtualenv == undef {`