From 123458029824c1053d08265a2f3fb3442201151b Mon Sep 17 00:00:00 2001
From: Aakarsh <agopi@redhat.com>
Date: Thu, 18 Oct 2018 19:18:11 +0000
Subject: [PATCH] Revert "Temporary fix to enable requests to work"

Issue was fixed upstream so can be reverted

This reverts commit 29acf2234e02b7780999df9f6cd4f082f084daad.

Change-Id: I65dd36ba51b995ea0fac67784153f717252a4b9a
---
 ansible/install/roles/browbeat/tasks/main.yml | 10 ----------
 ansible/install/roles/rally/tasks/main.yml    | 10 ----------
 2 files changed, 20 deletions(-)

diff --git a/ansible/install/roles/browbeat/tasks/main.yml b/ansible/install/roles/browbeat/tasks/main.yml
index f9bb1ca75..445cca71c 100644
--- a/ansible/install/roles/browbeat/tasks/main.yml
+++ b/ansible/install/roles/browbeat/tasks/main.yml
@@ -95,16 +95,6 @@
     - heat-admin-id_rsa
   when: "(tripleo == true and (hosts_file_exists.stat.exists == false or hosts_file_exists.stat.isreg == false))"
 
-# Temporary fix until
-# https://github.com/requests/requests/issues/4830
-# is fixed upstream
-
-- name: Install urllib3
-  pip:
-    name: urllib3
-    version: 1.23
-    virtualenv: "{{ browbeat_venv }}"
-
 - name: Install requirements.txt into browbeat-venv
   pip:
     requirements: "{{ browbeat_path }}/requirements.txt"
diff --git a/ansible/install/roles/rally/tasks/main.yml b/ansible/install/roles/rally/tasks/main.yml
index 27d5312f6..47431d341 100644
--- a/ansible/install/roles/rally/tasks/main.yml
+++ b/ansible/install/roles/rally/tasks/main.yml
@@ -15,16 +15,6 @@
     line: 'export REQUESTS_CA_BUNDLE={{ overcloud_ca_path }}'
   when: overcloud_ca_path is defined
 
-# Temporary fix until
-# https://github.com/requests/requests/issues/4830
-# is fixed upstream
-
-- name: Install urllib3
-  pip:
-    name: urllib3
-    version: 1.23
-    virtualenv: "{{ rally_venv }}"
-
 - name: Install Rally with OpenStack plugins into rally-venv
   pip:
     name: rally-openstack