From 6a8f21dedba753f5ae46d2f1aa842009b40074b8 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Thu, 23 Feb 2017 09:51:50 -0500
Subject: [PATCH] Use setuptools 33.1.1

As per [1] and [2] setuptools 34.0.0-34.2.0 does not handle
re-installs or upgrades properly.

This patch reduces the version we use to the last known
good version.

[1] https://github.com/pypa/setuptools/issues/951
[2] https://review.openstack.org/436948

Change-Id: Ic08f6d0035c4bbaa22412ad5f4176c2fe09cee3b
---
 global-requirement-pins.txt            | 2 +-
 playbooks/inventory/group_vars/all.yml | 2 +-
 scripts/scripts-library.sh             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt
index 1aa18b6095..4c078d0a47 100644
--- a/global-requirement-pins.txt
+++ b/global-requirement-pins.txt
@@ -10,5 +10,5 @@
 ### These pins are updated through the sources-branch-updater script ###
 ###
 pip==9.0.1
-setuptools==34.2.0
+setuptools==33.1.1
 wheel==0.29.0
diff --git a/playbooks/inventory/group_vars/all.yml b/playbooks/inventory/group_vars/all.yml
index 5dd0d300f3..9d6c576c1b 100644
--- a/playbooks/inventory/group_vars/all.yml
+++ b/playbooks/inventory/group_vars/all.yml
@@ -39,7 +39,7 @@ rsyslog_client_package_state: "{{ package_state }}"
 # These pins are updated through the sources-branch-updater script
 pip_packages:
   - pip==9.0.1
-  - setuptools==34.2.0
+  - setuptools==33.1.1
   - wheel==0.29.0
 
 pip_links:
diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh
index 78af34f773..325ba54cdb 100755
--- a/scripts/scripts-library.sh
+++ b/scripts/scripts-library.sh
@@ -20,7 +20,7 @@ LINE='----------------------------------------------------------------------'
 MAX_RETRIES=${MAX_RETRIES:-5}
 ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:--e gather_facts=False}
 STARTTIME="${STARTTIME:-$(date +%s)}"
-PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==34.2.0 wheel==0.29.0 '}
+PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==9.0.1 setuptools==33.1.1 wheel==0.29.0 '}
 COMMAND_LOGS=${COMMAND_LOGS:-"/openstack/log/ansible_cmd_logs"}
 
 # The default SSHD configuration has MaxSessions = 10. If a deployer changes