From 5d3c601dd43e8889d7cc2a4e3e9ce7a2cb02afc0 Mon Sep 17 00:00:00 2001 From: Jorge Niedbalski Date: Fri, 16 Jun 2017 11:31:11 -0400 Subject: [PATCH] Use interface param and fallback to endpoint_type on url_for. Since >= liberty the url_for parameter endpoint_type was replaced by interface https://github.com/openstack/keystoneauth/commit/d227f6d237c4309b21a32a115fc5b09b9ba46ef0 Change-Id: I98ebbf9f2c7582fae5f466dfc1d224bf66e38a24 Closes-Bug: #1698398 Signed-off-by: Jorge Niedbalski --- tests/basic_deployment.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 88ee5d20..3bcc0931 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -607,8 +607,14 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment): gl_ncc_rel = self.glance_sentry.relation( 'image-service', 'nova-cloud-controller:image-service') - ks_ep = self.keystone_demo.service_catalog.url_for( - service_type='identity', endpoint_type='publicURL') + # Since >= liberty endpoint_type was replaced by interface + # https://github.com/openstack/keystoneauth/commit/d227f6d237c4309b21a32a115fc5b09b9ba46ef0 + try: + ks_ep = self.keystone_demo.service_catalog.url_for( + service_type='identity', interface='publicURL') + except TypeError: + ks_ep = self.keystone_demo.service_catalog.url_for( + service_type='identity', endpoint_type='publicURL') ks_ec2 = "{}/ec2tokens".format(ks_ep)