components/openstack/cinder/patches/01-requirements.patch
branchs11u3-sru
changeset 6035 c9748fcc32de
parent 4937 8f0976d7e40e
child 6849 f9a2279efa0d
equal deleted inserted replaced
6016:a477397bba8b 6035:c9748fcc32de
     1 In-house patch to remove unnecessary dependencies from Cinder's
     1 In-house patch to remove unnecessary dependencies from Cinder's
     2 requirements files. The specific reasons are as follows:
     2 requirements files. The specific reasons are as follows:
     3 
     3 
     4 kombu           Not applicable
     4 anyjson		Not applicable
     5 
     5 
     6 oslo.rootwrap   Not applicable to Solaris
     6 kombu		Not applicable
     7 
     7 
     8 pycrypto        Not applicable to Solaris (various drivers specific)
     8 oslo.rootwrap	Not applicable to Solaris
     9 
     9 
    10 rtslib-fb       Not applicable to Solaris (Linux iSCSI specific)
    10 pycrypto	Not applicable to Solaris (various drivers specific)
    11 
    11 
    12 --- cinder-2014.2.2/cinder.egg-info/requires.txt.orig	2015-05-27 22:55:59.906826810 -0700
    12 rtslib-fb	Not applicable to Solaris (Linux iSCSI specific)
    13 +++ cinder-2014.2.2/cinder.egg-info/requires.txt	2015-05-27 22:57:00.022877081 -0700
    13 
    14 @@ -6,18 +6,15 @@
    14 --- cinder-2015.1.2/cinder.egg-info/requires.txt.~1~	2015-10-13 09:30:55.000000000 -0700
       
    15 +++ cinder-2015.1.2/cinder.egg-info/requires.txt	2016-01-30 21:00:52.192406009 -0800
       
    16 @@ -1,11 +1,9 @@
       
    17  pbr!=0.7,<1.0,>=0.6
       
    18 -anyjson>=0.3.3
       
    19  Babel>=1.3
       
    20  eventlet!=0.17.0,>=0.16.1
    15  greenlet>=0.3.2
    21  greenlet>=0.3.2
    16  iso8601>=0.1.9
    22  iso8601>=0.1.9
    17  keystonemiddleware>=1.0.0
    23  keystonemiddleware<1.6.0,>=1.5.0
    18 -kombu>=2.5.0
    24 -kombu>=2.5.0
    19  lxml>=2.3
    25  lxml>=2.3
    20  netaddr>=0.7.12
    26  netaddr>=0.7.12
    21  oslo.config>=1.4.0  # Apache-2.0
    27  oslo.config<1.10.0,>=1.9.3 # Apache-2.0
    22  oslo.db>=1.0.0,<1.1  # Apache-2.0
    28 @@ -15,14 +13,12 @@ oslo.db<1.8.0,>=1.7.0 # Apache-2.0
    23  oslo.messaging>=1.4.0,!=1.5.0,<1.6.0
    29  oslo.log<1.1.0,>=1.0.0 # Apache-2.0
    24 -oslo.rootwrap>=1.3.0
    30  oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0
    25  osprofiler>=0.3.0                       # Apache-2.0
    31  oslo.middleware<1.1.0,>=1.0.0 # Apache-2.0
       
    32 -oslo.rootwrap<1.7.0,>=1.6.0 # Apache-2.0
       
    33  oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
       
    34  oslo.utils!=1.4.1,<1.5.0,>=1.4.0 # Apache-2.0
       
    35  osprofiler>=0.3.0 # Apache-2.0
    26  paramiko>=1.13.0
    36  paramiko>=1.13.0
    27  Paste
    37  Paste
    28  PasteDeploy>=1.5.0
    38  PasteDeploy>=1.5.0
    29 -pycrypto>=2.6
    39 -pycrypto>=2.6
    30  python-barbicanclient>=2.1.0,!=3.0.0,<3.0.2
    40  pyparsing>=2.0.1
    31  python-glanceclient>=0.14.0
    41  python-barbicanclient<3.1.0,>=3.0.1
    32  python-novaclient>=2.18.0
    42  python-glanceclient<0.18.0,>=0.15.0
    33 @@ -25,7 +22,6 @@
    43 @@ -32,7 +28,6 @@ requests!=2.4.0,>=2.2.0
    34  requests>=1.2.1,!=2.4.0
    44  retrying!=1.3.0,>=1.2.3 # Apache-2.0
    35  Routes>=1.12.3,!=2.0
    45  Routes!=2.0,>=1.12.3
    36  taskflow>=0.4,<0.7.0
    46  taskflow<0.8.0,>=0.7.1
    37 -rtslib-fb>=2.1.39
    47 -rtslib-fb>=2.1.41
    38  six>=1.7.0
    48  six>=1.9.0
    39  SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
    49  SQLAlchemy<=0.9.99,>=0.9.7
    40  sqlalchemy-migrate==0.9.1
    50  sqlalchemy-migrate!=0.9.8,<0.10.0,>=0.9.5
    41 --- cinder-2014.2.2/requirements.txt.orig       2015-05-27 22:57:45.226877884 -0700
    51 --- cinder-2015.1.2/requirements.txt.~1~	2015-10-13 09:27:35.000000000 -0700
    42 +++ cinder-2014.2.2/requirements.txt    2015-05-27 22:58:25.817248288 -0700
    52 +++ cinder-2015.1.2/requirements.txt	2016-01-30 21:01:27.270741292 -0800
    43 @@ -10,18 +10,15 @@
    53 @@ -3,13 +3,11 @@
       
    54  # process, which may cause wedges in the gate later.
       
    55  
       
    56  pbr!=0.7,<1.0,>=0.6
       
    57 -anyjson>=0.3.3
       
    58  Babel>=1.3
       
    59  eventlet!=0.17.0,>=0.16.1
    44  greenlet>=0.3.2
    60  greenlet>=0.3.2
    45  iso8601>=0.1.9
    61  iso8601>=0.1.9
    46  keystonemiddleware>=1.0.0
    62  keystonemiddleware<1.6.0,>=1.5.0
    47 -kombu>=2.5.0
    63 -kombu>=2.5.0
    48  lxml>=2.3
    64  lxml>=2.3
    49  netaddr>=0.7.12
    65  netaddr>=0.7.12
    50  oslo.config>=1.4.0  # Apache-2.0
    66  oslo.config<1.10.0,>=1.9.3 # Apache-2.0
    51  oslo.db>=1.0.0,<1.1  # Apache-2.0
    67 @@ -19,14 +17,12 @@ oslo.db<1.8.0,>=1.7.0 # Apache-2.0
    52  oslo.messaging>=1.4.0,!=1.5.0,<1.6.0
    68  oslo.log<1.1.0,>=1.0.0 # Apache-2.0
    53 -oslo.rootwrap>=1.3.0
    69  oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0
    54  osprofiler>=0.3.0                       # Apache-2.0
    70  oslo.middleware<1.1.0,>=1.0.0 # Apache-2.0
       
    71 -oslo.rootwrap<1.7.0,>=1.6.0 # Apache-2.0
       
    72  oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
       
    73  oslo.utils!=1.4.1,<1.5.0,>=1.4.0 # Apache-2.0
       
    74  osprofiler>=0.3.0 # Apache-2.0
    55  paramiko>=1.13.0
    75  paramiko>=1.13.0
    56  Paste
    76  Paste
    57  PasteDeploy>=1.5.0
    77  PasteDeploy>=1.5.0
    58 -pycrypto>=2.6
    78 -pycrypto>=2.6
    59  python-barbicanclient>=2.1.0,!=3.0.0,<3.0.2
    79  pyparsing>=2.0.1
    60  python-glanceclient>=0.14.0
    80  python-barbicanclient<3.1.0,>=3.0.1
    61  python-novaclient>=2.18.0
    81  python-glanceclient<0.18.0,>=0.15.0
    62 @@ -29,7 +26,6 @@
    82 @@ -36,7 +32,6 @@ requests!=2.4.0,>=2.2.0
    63  requests>=1.2.1,!=2.4.0
    83  retrying!=1.3.0,>=1.2.3 # Apache-2.0
    64  Routes>=1.12.3,!=2.0
    84  Routes!=2.0,>=1.12.3
    65  taskflow>=0.4,<0.7.0
    85  taskflow<0.8.0,>=0.7.1
    66 -rtslib-fb>=2.1.39
    86 -rtslib-fb>=2.1.41
    67  six>=1.7.0
    87  six>=1.9.0
    68  SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
    88  SQLAlchemy<=0.9.99,>=0.9.7
    69  sqlalchemy-migrate==0.9.1
    89  sqlalchemy-migrate!=0.9.8,<0.10.0,>=0.9.5
    70