diff --git a/modules/openstack_project/manifests/thick_slave.pp b/modules/openstack_project/manifests/thick_slave.pp index e55297e45f..059cb37fcf 100644 --- a/modules/openstack_project/manifests/thick_slave.pp +++ b/modules/openstack_project/manifests/thick_slave.pp @@ -41,7 +41,6 @@ class openstack_project::thick_slave( $::openstack_project::jenkins_params::python_libvirt_package, $::openstack_project::jenkins_params::python_lxml_package, # for validating openstack manuals $::openstack_project::jenkins_params::python_magic_package, # for pushing files to swift - $::openstack_project::jenkins_params::python_requests_package, # for pushing files to swift $::openstack_project::jenkins_params::python_zmq_package, # zeromq unittests (not pip installable) $::openstack_project::jenkins_params::rubygems_package, $::openstack_project::jenkins_params::sbcl_package, # cl-openstack-client testing @@ -57,6 +56,18 @@ class openstack_project::thick_slave( ensure => present, } + include pip + # for pushing files to swift and uploading to pypi with twine + package { 'requests': + ensure => latest, + provider => pip, + } + # transitional for upgrading to the pip version + package { $::openstack_project::jenkins_params::python_requests_package: + ensure => absent, + before => Package['requests'], + } + if ($::lsbdistcodename == 'trusty') { file { '/etc/profile.d/rubygems.sh': ensure => absent,