opendev/puppet-pip
Code Issues Proposed changes

Fix pip executable path for RH

Browse Source 
get-pip.py installs pip to /bin/pip on centos 7. Without this fix, the
download-pip exec will keep trying to install pip whether or not it is
already installed on our base images or by puppet.

Change-Id: Ic5bcce59148aacedc61315e616317fc73c2c161c
This commit is contained in:
Colleen Murphy 2016-04-06 13:26:46 -07:00
parent 63ef1497e2
commit d5655ff4d1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@ -15,7 +15,7 @@ class pip (
exec { 'download-pip': exec { 'download-pip':
command => "/usr/bin/curl ${::pip::params::get_pip_location} | /usr/bin/python", command => "/usr/bin/curl ${::pip::params::get_pip_location} | /usr/bin/python",
creates => '/usr/local/bin/pip', creates => $::pip::params::get_pip_path,
} }
if $manage_pip_conf { if $manage_pip_conf {

2
manifests/params.pp
View File

@ -10,11 +10,13 @@ class pip::params {
$python_devel_package = 'python-devel' $python_devel_package = 'python-devel'
$python3_devel_package = 'python3-devel' $python3_devel_package = 'python3-devel'
$python3_pip_package = 'python3-pip' $python3_pip_package = 'python3-pip'
$get_pip_path = '/bin/pip'
} }
'Debian': { 'Debian': {
$python_devel_package = 'python-all-dev' $python_devel_package = 'python-all-dev'
$python3_devel_package = 'python3-all-dev' $python3_devel_package = 'python3-all-dev'
$python3_pip_package = 'python3-pip' $python3_pip_package = 'python3-pip'
$get_pip_path = '/usr/local/bin/pip'
} }
default: { default: {
fail("Unsupported osfamily: ${::osfamily} The 'pip' module only supports osfamily Debian or RedHat.") fail("Unsupported osfamily: ${::osfamily} The 'pip' module only supports osfamily Debian or RedHat.")