From 2f038884b66a62aba2334e7a9947ec4e2ac89229 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 4 Jun 2014 22:21:23 +0000
Subject: [PATCH] Install newer requests package for twine

The twine upload client for PyPI needs a newer version of the Python
requests library than is provided on Ubuntu 12.04, so get it via pip
instead of from distribution packages.

Change-Id: Ibc9a7e1e496a3aa573902c4d1aad11d20187d260
---
 modules/openstack_project/manifests/thick_slave.pp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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,