diff --git a/heat/common/endpoint_utils.py b/heat/common/endpoint_utils.py index cb5b699ac5..75c07fcabe 100644 --- a/heat/common/endpoint_utils.py +++ b/heat/common/endpoint_utils.py @@ -34,5 +34,8 @@ def get_auth_uri(v3=True): else: # Import auth_token to have keystone_authtoken settings setup. importutils.import_module('keystonemiddleware.auth_token') - auth_uri = cfg.CONF.keystone_authtoken.www_authenticate_uri + try: + auth_uri = cfg.CONF.keystone_authtoken.www_authenticate_uri + except cfg.NoSuchOptError: + auth_uri = cfg.CONF.keystone_authtoken.auth_uri return auth_uri.replace('v2.0', 'v3') if auth_uri and v3 else auth_uri diff --git a/heat/tests/api/aws/test_api_ec2token.py b/heat/tests/api/aws/test_api_ec2token.py index 8a78749c83..135b57a175 100644 --- a/heat/tests/api/aws/test_api_ec2token.py +++ b/heat/tests/api/aws/test_api_ec2token.py @@ -571,8 +571,12 @@ class Ec2TokenTest(common.HeatTestCase): # Import auth_token to have keystone_authtoken settings setup. importutils.import_module('keystonemiddleware.auth_token') dummy_url = 'http://123:5000/v2.0' - cfg.CONF.set_override('www_authenticate_uri', dummy_url, - group='keystone_authtoken') + try: + cfg.CONF.set_override('www_authenticate_uri', dummy_url, + group='keystone_authtoken') + except cfg.NoSuchOptError: + cfg.CONF.set_override('auth_uri', dummy_url, + group='keystone_authtoken') ec2 = ec2token.EC2Token(app='woot', conf={}) params = {'AWSAccessKeyId': 'foo', 'Signature': 'xyz'} req_env = {'SERVER_NAME': 'heat', diff --git a/heat/tests/test_common_context.py b/heat/tests/test_common_context.py index 70defe5edc..405eaf8696 100644 --- a/heat/tests/test_common_context.py +++ b/heat/tests/test_common_context.py @@ -218,8 +218,12 @@ class TestRequestContext(common.HeatTestCase): [clients_keystone] section. """ importutils.import_module('keystonemiddleware.auth_token') - cfg.CONF.set_override('www_authenticate_uri', 'http://abc/v2.0', - group='keystone_authtoken') + try: + cfg.CONF.set_override('www_authenticate_uri', 'http://abc/v2.0', + group='keystone_authtoken') + except cfg.NoSuchOptError: + cfg.CONF.set_override('auth_uri', 'http://abc/v2.0', + group='keystone_authtoken') policy_check = 'heat.common.policy.Enforcer.check_is_admin' with mock.patch(policy_check) as pc: pc.return_value = False diff --git a/lower-constraints.txt b/lower-constraints.txt index 4e60e9fb6c..2c7cba0f8a 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -90,7 +90,7 @@ pika==0.10.0 ply==3.11 prettytable==0.7.2 psutil==5.4.3 -psycopg2==2.6.2 +psycopg2==2.7 pyasn1==0.4.2 pycadf==2.7.0 pycparser==2.18 @@ -102,7 +102,7 @@ pyOpenSSL==17.5.0 pyparsing==2.2.0 pyperclip==1.6.0 python-barbicanclient==4.5.2 -python-blazarclient===1.0.0 +python-blazarclient===1.0.1 python-ceilometerclient==2.5.0 python-cinderclient==3.3.0 python-dateutil==2.7.0 @@ -111,7 +111,7 @@ python-editor==1.0.3 python-glanceclient==2.8.0 python-heatclient==1.10.0 python-keystoneclient==3.8.0 -python-magnumclient==2.1.0 +python-magnumclient==2.3.0 python-manilaclient==1.16.0 python-mimeparse==1.6.0 python-mistralclient==3.1.0 @@ -124,7 +124,7 @@ python-saharaclient==1.4.0 python-subunit==1.2.0 python-swiftclient==3.2.0 python-troveclient==2.2.0 -python-zaqarclient==1.0.0 +python-zaqarclient==1.3.0 python-zunclient==2.0.0 pytz==2013.6 PyYAML==3.12 @@ -153,7 +153,7 @@ unittest2==1.1.0 urllib3==1.22 vine==1.1.4 voluptuous==0.11.1 -warlock==1.3.0 +warlock==1.2.0 WebOb==1.7.1 websocket-client==0.47.0 wrapt==1.10.11 diff --git a/requirements.txt b/requirements.txt index ca1a089ebd..27e5e2bd88 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,13 +33,13 @@ oslo.versionedobjects>=1.31.2 # Apache-2.0 PasteDeploy>=1.5.0 # MIT aodhclient>=0.9.0 # Apache-2.0 python-barbicanclient>=4.5.2 # Apache-2.0 -python-blazarclient>=1.0.0 # Apache-2.0 +python-blazarclient>=1.0.1 # Apache-2.0 python-cinderclient>=3.3.0 # Apache-2.0 python-designateclient>=2.7.0 # Apache-2.0 python-glanceclient>=2.8.0 # Apache-2.0 python-heatclient>=1.10.0 # Apache-2.0 python-keystoneclient>=3.8.0 # Apache-2.0 -python-magnumclient>=2.1.0 # Apache-2.0 +python-magnumclient>=2.3.0 # Apache-2.0 python-manilaclient>=1.16.0 # Apache-2.0 python-mistralclient!=3.2.0,>=3.1.0 # Apache-2.0 python-monascaclient>=1.12.0 # Apache-2.0 @@ -50,7 +50,7 @@ python-openstackclient>=3.12.0 # Apache-2.0 python-saharaclient>=1.4.0 # Apache-2.0 python-swiftclient>=3.2.0 # Apache-2.0 python-troveclient>=2.2.0 # Apache-2.0 -python-zaqarclient>=1.0.0 # Apache-2.0 +python-zaqarclient>=1.3.0 # Apache-2.0 python-zunclient>=2.0.0 # Apache-2.0 pytz>=2013.6 # MIT PyYAML>=3.12 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 4500a40b8c..0361cdb8bc 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -11,7 +11,7 @@ kombu!=4.0.2,>=4.0.0 # BSD mock>=2.0.0 # BSD PyMySQL>=0.7.6 # MIT License oslotest>=3.2.0 # Apache-2.0 -psycopg2>=2.6.2 # LGPL/ZPL +psycopg2>=2.7 # LGPL/ZPL stestr>=2.0.0 # Apache-2.0 testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT diff --git a/tox.ini b/tox.ini index 10f5174469..c8b2dab6de 100644 --- a/tox.ini +++ b/tox.ini @@ -135,6 +135,7 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen [testenv:lower-constraints] basepython = python3 +install_command = pip install {opts} {packages} deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt