Revert "Update setuptools to 36.2.0"

Our pip, setuptools, wheel install process is seperate
from the installation of other packages, so it still
works. The problem comes in when you try to up/downgrade
setuptools at the same time as installing other packages.
This problem was prevalent when doing docs/linters tests.

This partially reverts commit
504da781cc and removes the
constraint from the tox config so that doc and linter
tests will not try to force a up/downgrade for these
packages.

Change-Id: I27f843d443b32c52b5f9ec6be581a9366c8dbcf5

global-requirement-pins.txt

@@ -17,5 +17,5 @@ ldappool==2.1.0
 ### These pins are updated through the sources-branch-updater script ###
 ###
 pip==9.0.1
-setuptools==36.2.0
+setuptools==33.1.1
 wheel==0.29.0

playbooks/inventory/group_vars/all.yml

@@ -53,7 +53,7 @@ repo_release_path: "{{ openstack_repo_url }}/os-releases/{{ openstack_release }}
 # These pins are updated through the sources-branch-updater script
 pip_packages:
   - pip==9.0.1
-  - setuptools==36.2.0
+  - setuptools==33.1.1
   - wheel==0.29.0
 
 pip_links:

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==36.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

tox.ini

@@ -8,7 +8,7 @@ envlist = linters,docs,releasenotes
 usedevelop = True
 basepython = python2.7
 install_command =
-    pip install -c{toxinidir}/global-requirement-pins.txt -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata} {opts} {packages}
+    pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata} {opts} {packages}
 deps =
     -r{toxinidir}/global-requirement-pins.txt
     -r{toxinidir}/test-requirements.txt