1 In-house patch to remove the dependency on argparse.  Since we use

     2 Python 2.7 only for OpenStack, argparse is already included.  If this

     3 line is present, stevedore will fail to find the pip package for it,

     4 causing a cascade of failures to other tools.

     5 

     6 Drop the required version of keystoneclient to be the same as Kilo

     7 global reqs.  This version of cinderclient was cherry picked to

     8 pull in features that were missed because the cinder team did not

     9 cut a cinderclient to match the kilo release.

    10 

    11 --- python-cinderclient-1.3.1/requirements.txt.orig	2015-11-19 14:55:25.974425490 -0700

    12 +++ python-cinderclient-1.3.1/requirements.txt	2015-11-19 14:56:46.549580080 -0700

    13 @@ -2,9 +2,8 @@

    14  # of appearance. Changing the order has an impact on the overall integration

    15  # process, which may cause wedges in the gate later.

    16  pbr<2.0,>=0.11

    17 -argparse

    18  PrettyTable<0.8,>=0.7

    19 -python-keystoneclient>=1.6.0

    20 +python-keystoneclient<1.4.0,>=1.2.0

    21  requests>=2.5.2

    22  simplejson>=2.2.0

    23  Babel>=1.3

    24 

    25 --- python-cinderclient-1.3.1/python_cinderclient.egg-info/requires.txt.orig	2015-11-19 14:57:35.202730172 -0700

    26 +++ python-cinderclient-1.3.1/python_cinderclient.egg-info/requires.txt	2015-11-19 14:57:18.307302488 -0700

    27 @@ -1,7 +1,6 @@

    28  pbr<2.0,>=0.11

    29 -argparse

    30  PrettyTable<0.8,>=0.7

    31 -python-keystoneclient>=1.6.0

    32 +python-keystoneclient<1.4.0,>=1.2.0

    33  requests>=2.5.2

    34  simplejson>=2.2.0

    35  Babel>=1.3