Add initial py3 support (with pip3)
Support using pip3 binary to install python applications under python3. Change-Id: I943e5cbcc55a09edb9431298e3f0a17e2aef5acf Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
5d5bdb0e42
commit
1c2aca510f
@ -64,10 +64,20 @@ class zuul (
|
||||
$sites = [],
|
||||
$nodes = [],
|
||||
$connections = [],
|
||||
$python_version = 2,
|
||||
) {
|
||||
include ::httpd
|
||||
include ::pip
|
||||
|
||||
if ($python_version == 3) {
|
||||
include ::pip::python3
|
||||
$pip_provider = pip3
|
||||
$pip_command = 'pip3'
|
||||
} else {
|
||||
$pip_provider = openstack_pip
|
||||
$pip_command = 'pip'
|
||||
}
|
||||
|
||||
$packages = [
|
||||
'python-paste',
|
||||
'python-webob',
|
||||
@ -86,7 +96,7 @@ class zuul (
|
||||
|
||||
package { 'yappi':
|
||||
ensure => present,
|
||||
provider => openstack_pip,
|
||||
provider => $pip_provider,
|
||||
require => Class['pip'],
|
||||
}
|
||||
|
||||
@ -145,7 +155,7 @@ class zuul (
|
||||
}
|
||||
|
||||
exec { 'install_zuul' :
|
||||
command => 'pip install -U /opt/zuul',
|
||||
command => "${pip_command} install -U /opt/zuul",
|
||||
path => '/usr/local/bin:/usr/bin:/bin/',
|
||||
refreshonly => true,
|
||||
subscribe => Vcsrepo['/opt/zuul'],
|
||||
|
Loading…
x
Reference in New Issue
Block a user