openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Use interface param and fallback to endpoint_type on url_for.

Browse Source 
Since >= liberty the url_for parameter endpoint_type was replaced by
interface d227f6d237

Change-Id: I98ebbf9f2c7582fae5f466dfc1d224bf66e38a24
Closes-Bug: #1698398
Signed-off-by: Jorge Niedbalski <jorge.niedbalski@canonical.com>
This commit is contained in:
Jorge Niedbalski
2017-06-16 11:31:11 -04:00
parent 0d28006e1c
commit 5d3c601dd4
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/basic_deployment.py
View File

@@ -607,6 +607,12 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
gl_ncc_rel = self.glance_sentry.relation( gl_ncc_rel = self.glance_sentry.relation(
'image-service', 'nova-cloud-controller:image-service') 'image-service', 'nova-cloud-controller:image-service')
# 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( ks_ep = self.keystone_demo.service_catalog.url_for(
service_type='identity', endpoint_type='publicURL') service_type='identity', endpoint_type='publicURL')