update from global requirements for liberty release
Change-Id: Iaaabb50d3894eb0218f524307376e2d0fd3ab855
This commit is contained in:
parent
1bcfbe453c
commit
10c9562437
|
@ -25,7 +25,10 @@ FLAVOR_NAME_ALT="m1.ec2api-alt"
|
|||
|
||||
if [[ -n "$TOP_DIR" ]]; then
|
||||
source $TOP_DIR/accrc/admin/admin
|
||||
# bug somewhere
|
||||
unset OS_AUTH_TYPE
|
||||
# remove v2.0 from OS_AUTH_URL
|
||||
export OS_AUTH_URL=$(echo $OS_AUTH_URL | sed -r "s#(.*\/).*#\1#")
|
||||
fi
|
||||
|
||||
openstack endpoint list
|
||||
|
|
|
@ -109,7 +109,7 @@ class MockOSMixin(object):
|
|||
|
||||
def mock_glance(self):
|
||||
glance_patcher = mock.patch('glanceclient.client.Client')
|
||||
glance = mock.create_autospec(glanceclient.Client(endpoint='fake/v1'))
|
||||
glance = mock.create_autospec(glanceclient.Client(endpoint='v1'))
|
||||
glance_patcher.start().return_value = glance
|
||||
self.addCleanup(glance_patcher.stop)
|
||||
return glance
|
||||
|
|
|
@ -9,19 +9,19 @@ lxml>=2.3
|
|||
oslo.concurrency>=2.3.0 # Apache-2.0
|
||||
oslo.config>=2.3.0 # Apache-2.0
|
||||
oslo.context>=0.2.0
|
||||
oslo.messaging>=1.16.0,!=1.17.0,!=1.17.1 # Apache-2.0
|
||||
oslo.messaging>=1.16.0,!=1.17.0,!=1.17.1,!=2.6.0,!=2.6.1 # Apache-2.0
|
||||
oslo.log>=1.8.0 # Apache-2.0
|
||||
oslo.utils>=2.0.0 # Apache-2.0
|
||||
oslo.utils>=2.0.0,!=2.6.0 # Apache-2.0
|
||||
oslo.serialization>=1.4.0 # Apache-2.0
|
||||
oslo.db>=2.4.1 # Apache-2.0
|
||||
Paste
|
||||
PasteDeploy>=1.5.0
|
||||
pbr>=1.6,<2.0
|
||||
pbr>=1.6
|
||||
python-cinderclient>=1.3.1
|
||||
python-glanceclient>=0.18.0
|
||||
python-keystoneclient>=1.6.0
|
||||
python-keystoneclient>=1.6.0,!=1.8.0
|
||||
python-neutronclient>=2.6.0
|
||||
python-novaclient>=2.28.1
|
||||
python-novaclient>=2.28.1,!=2.33.0
|
||||
python-openstackclient>=1.5.0
|
||||
Routes>=1.12.3,!=2.0,!=2.1;python_version=='2.7'
|
||||
Routes>=1.12.3,!=2.0;python_version!='2.7'
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[metadata]
|
||||
name = ec2-api
|
||||
version = 1.0
|
||||
version = 1.0.0
|
||||
summary = OpenStack Ec2api Service
|
||||
description-file =
|
||||
README.rst
|
||||
|
|
|
@ -7,6 +7,6 @@ oslotest>=1.10.0 # Apache-2.0
|
|||
pylint==1.4.4 # GNU GPL v2
|
||||
python-subunit>=0.0.18
|
||||
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
|
||||
tempest-lib>=0.6.1
|
||||
tempest-lib>=0.8.0
|
||||
testrepository>=0.0.18
|
||||
testtools>=1.4.0
|
||||
|
|
Loading…
Reference in New Issue