From 81a750da5ee5cd2b63eae5f13d37372dce6f0cf3 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Mon, 12 Oct 2015 19:09:58 +0100
Subject: [PATCH] Block/cap incompatible libraries

This updates the global requirements to block requests 2.8.0 due to:
  https://launchpad.net/bugs/1476770 and
  https://launchpad.net/bugs/1503768 and
  https://launchpad.net/bugs/1505326

And also blocks oslo.messaging 2.6.0 temporarily due to:
  https://launchpad.net/bugs/1505295

And also blocks oslo.versionedobjects 0.11.0 temporarily due to:
  https://launchpad.net/bugs/1505677

And also blocks WebOb<1.5.0 temporarily due to:
  https://launchpad.net/bugs/1505153

Related-Bug: #1476770
Related-Bug: #1503768
Related-Bug: #1505326
Related-Bug: #1505295
Related-Bug: #1505153
Related-Bug: #1505677
Change-Id: I3aabbf717ef21a41c7bb9d21957df838642926f0
---
 global-requirement-pins.txt                     | 17 +++++++++++++++++
 .../repo_packages/openstack_services.yml        |  2 +-
 playbooks/plugins/lookups/py_pkgs.py            |  3 ++-
 requirements.txt                                |  4 ++--
 4 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 global-requirement-pins.txt

diff --git a/global-requirement-pins.txt b/global-requirement-pins.txt
new file mode 100644
index 0000000000..c05154d44d
--- /dev/null
+++ b/global-requirement-pins.txt
@@ -0,0 +1,17 @@
+# This file was created to collocate pins that are needed but should not be
+#  installed as base requirements
+
+
+# Temporary pin:
+#  https://launchpad.net/bugs/1505295
+oslo.messaging!=2.6.0
+
+
+# Temporary pin:
+#  https://launchpad.net/bugs/1505153
+WebOb<1.5.0
+
+
+# Temporary pin:
+#  https://launchpad.net/bugs/1505677
+oslo.versionedobjects!=0.11.0
diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml
index d7d60d1987..7855e05ca2 100644
--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ b/playbooks/defaults/repo_packages/openstack_services.yml
@@ -31,7 +31,7 @@
 
 ## Global Requirements
 requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: f82ab92ed8ff1a278391a196a39382fbb4211583 # HEAD of "stable/liberty" as of 08.10.2015
+requirements_git_install_branch: eaf04e511c6d604ef84f47cc3f915ec9a4b95d9f # HEAD of "stable/liberty" as of 09.10.2015
 requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}"
 
 
diff --git a/playbooks/plugins/lookups/py_pkgs.py b/playbooks/plugins/lookups/py_pkgs.py
index ac1ffb633d..2ad3d30579 100644
--- a/playbooks/plugins/lookups/py_pkgs.py
+++ b/playbooks/plugins/lookups/py_pkgs.py
@@ -29,7 +29,8 @@ REQUIREMENTS_FILE_TYPES = [
     'requirements.txt',
     'global-requirements.txt',
     'test-requirements.txt',
-    'dev-requirements.txt'
+    'dev-requirements.txt',
+    'global-requirement-pins.txt'
 ]
 
 
diff --git a/requirements.txt b/requirements.txt
index f29cd0ef6c..4c5abe03aa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-cloudlib>=0.3.0         # scripts/os-ansible-role-requirements.py
+cloudlib>=0.3.0         # scripts/openstack-ansible-role-requirements.py
 Jinja2>=2.6             # ansible
 netaddr>=0.7.12         # playbooks/inventory/dynamic_inventory.py
 paramiko>=1.13.0        # ansible
@@ -6,4 +6,4 @@ pip>=6.0
 PrettyTable>=0.7,<0.8   # scripts/inventory-manage.py
 pycrypto>=2.6           # ansible
 PyYAML>=3.1.0           # ansible
-requests>=2.2.0,!=2.4.0 # scripts/os-ansible-role-requirements.py
+requests>=2.2.0,!=2.4.0 # scripts/openstack-ansible-role-requirements.py