zuul/nodepool
Code Issues Proposed changes

Merge "Fix Nodepool DIB Uploads to Glance w/o region_name"

Browse Source
This commit is contained in:
Jenkins 2015-03-19 02:00:11 +00:00 committed by Gerrit Code Review
commit 68f8452f02
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nodepool/provider_manager.py
View File

@ -482,15 +482,17 @@ class ProviderManager(TaskManager):
'password': provider.password,
'tenant_name': provider.project_id}
glance_kwargs = {'service_type': 'image'}
glance_endpoint_kwargs = {'service_type': 'image'}
if provider.region_name:
keystone_kwargs['region_name'] = provider.region_name
glance_endpoint_kwargs['attr'] = 'region'
glance_endpoint_kwargs['filter_value'] = provider.region_name
# get endpoint and authtoken
keystone = ksclient.Client(**keystone_kwargs)
glance_endpoint = keystone.service_catalog.url_for(
attr='region',
filter_value=keystone_kwargs['region_name'],
service_type='image')
**glance_endpoint_kwargs)
glance_endpoint = glance_endpoint.replace('/v1.0', '')
# configure glance client