Add pip3 support
We are wanting to start running python3 applications in production, as a results we need to ensure that pip3 is created. Because get-pip.py will override existing pip executables, it will be possible for an existing server to have is version change to python3. As a result, symlink specifically to pip2 to ensure we have defaulted properly to python3. Drop Babel from acceptance testing, this appears to be a failure that needs to be looked at in the future. Change-Id: I8f78dfc62cd3745e900eec573e80236137ac5c78 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
4b3f7168ae
commit
35a83454f2
@ -13,9 +13,26 @@ class pip (
|
|||||||
ensure => present,
|
ensure => present,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $::operatingsystem != 'CentOS' {
|
||||||
|
exec { 'download-pip3':
|
||||||
|
command => "/usr/bin/curl ${::pip::params::get_pip_location} | /usr/bin/python3 - -U --force-reinstall",
|
||||||
|
creates => $::pip::params::get_pip3_path,
|
||||||
|
before => Exec['download-pip'],
|
||||||
|
notify => Exec[$::pip::params::get_pip_path]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
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 - -U --force-reinstall",
|
||||||
creates => $::pip::params::get_pip_path,
|
creates => $::pip::params::get_pip2_path,
|
||||||
|
notify => Exec[$::pip::params::get_pip_path]
|
||||||
|
}
|
||||||
|
|
||||||
|
# NOTE(pabelanger): Default to pip2 for backwards compat
|
||||||
|
exec { $::pip::params::get_pip_path:
|
||||||
|
command => "ln -sf ${::pip::params::get_pip_path} ${::pip::params::get_pip2_path}",
|
||||||
|
path => '/usr/bin:/bin/',
|
||||||
|
refreshonly => true,
|
||||||
}
|
}
|
||||||
|
|
||||||
if $manage_pip_conf {
|
if $manage_pip_conf {
|
||||||
|
@ -11,18 +11,24 @@ class pip::params {
|
|||||||
$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'
|
$get_pip_path = '/bin/pip'
|
||||||
|
$get_pip2_path = '/bin/pip2'
|
||||||
|
$get_pip3_path = '/bin/pip3'
|
||||||
}
|
}
|
||||||
'Suse': {
|
'Suse': {
|
||||||
$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 = '/usr/bin/pip'
|
$get_pip_path = '/usr/bin/pip'
|
||||||
|
$get_pip2_path = '/usr/bin/pip2'
|
||||||
|
$get_pip3_path = '/usr/bin/pip3'
|
||||||
}
|
}
|
||||||
'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'
|
$get_pip_path = '/usr/local/bin/pip'
|
||||||
|
$get_pip2_path = '/usr/local/bin/pip2'
|
||||||
|
$get_pip3_path = '/usr/local/bin/pip3'
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
fail("Unsupported osfamily: ${::osfamily} The 'pip' module only supports osfamily Debian, RedHat or SUSE.")
|
fail("Unsupported osfamily: ${::osfamily} The 'pip' module only supports osfamily Debian, RedHat or SUSE.")
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
include pip
|
include pip
|
||||||
|
|
||||||
$packages = [
|
$packages = [
|
||||||
'Babel',
|
|
||||||
'bandersnatch',
|
'bandersnatch',
|
||||||
'elasticsearch-curator',
|
'elasticsearch-curator',
|
||||||
'gear',
|
'gear',
|
||||||
|
Loading…
Reference in New Issue
Block a user