bugfix install pip on centos6 using scl

Author: netors

manifests/install.pp

@@ -18,7 +18,7 @@
   $python = $::python::version ? {
     'system' => 'python',
     'pypy'   => 'pypy',
-    default  => "python${python::version}",
+    default  => "${python::version}",
   }
 
   $pythondev = $::osfamily ? {
@@ -50,11 +50,6 @@
     name   => $python,
   }
 
-  package { 'pip':
-    ensure  => $pip_ensure,
-    require => Package['python'],
-  }
-
   package { 'virtualenv':
     ensure  => $venv_ensure,
     require => Package['python'],
@@ -63,6 +58,11 @@
   case $python::provider {
     pip: {
 
+      package { 'pip':
+        ensure  => $pip_ensure,
+        require => Package['python'],
+      }
+
       package { 'python-dev':
         ensure => $dev_ensure,
         name   => $pythondev,
@@ -123,7 +123,7 @@
       }
       if $pip_ensure != 'absent' {
         exec { 'python-scl-pip-install':
-          command => "${python::params::exec_prefix}easy_install pip",
+          command => "${python::exec_prefix}easy_install pip",
           path    => ['/usr/bin', '/bin'],
           creates => "/opt/rh/${python::version}/root/usr/bin/pip",
           require => Package['scl-utils'],
@@ -163,6 +163,11 @@
 
     default: {
 
+      package { 'pip':
+        ensure  => $pip_ensure,
+        require => Package['python'],
+      }
+
       package { 'python-dev':
         ensure => $dev_ensure,
         name   => $pythondev,