opendev/system-config
Code Issues Proposed changes

Merge "Safely remove python-requests on workers"

Browse Source
This commit is contained in:
Jenkins 2014-08-15 23:45:28 +00:00 committed by Gerrit Code Review
commit 685556c929
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openstack_project/manifests/thick_slave.pp
View File

@ -61,11 +61,19 @@ class openstack_project::thick_slave(
ensure => latest, ensure => latest,
provider => pip, provider => pip,
} }
# transitional for upgrading to the pip version if ($::osfamily == 'RedHat') {
# Work around https://bugzilla.redhat.com/show_bug.cgi?id=973375
exec { 'remove_requests':
command => "/usr/bin/yum remove -y ${::openstack_project::jenkins_params::python_requests_package}",
onlyif => "/bin/rpm -qa|/bin/grep -q ${::openstack_project::jenkins_params::python_requests_package}",
before => Package['requests'],
}
} else {
package { $::openstack_project::jenkins_params::python_requests_package: package { $::openstack_project::jenkins_params::python_requests_package:
ensure => absent, ensure => absent,
before => Package['requests'], before => Package['requests'],
} }
}
if ($::lsbdistcodename == 'trusty') { if ($::lsbdistcodename == 'trusty') {
file { '/etc/profile.d/rubygems.sh': file { '/etc/profile.d/rubygems.sh':