Rename glance to glare

This commit renames glance options to glare, to avoid confusion.
According to Iced3c68010eb6bcd2a6a1ec8f1c6883f84cbe77f new endpoint is
going to be artifact, this commit reflects that.

Change-Id: Ib5854601cacdc81cf9637f08ef40d02b6c9fdf7a
Closes-Bug: #1550427
This commit is contained in:
Kirill Zaitsev 2016-02-26 21:02:19 +03:00
parent 94b0c092ed
commit a1316a5ce4
2 changed files with 13 additions and 6 deletions

View File

@ -99,21 +99,21 @@ def _get_endpoint(request):
return endpoint
def _get_glance_endpoint(request):
endpoint = getattr(settings, 'GLANCE_API_URL', None)
def _get_glare_endpoint(request):
endpoint = getattr(settings, 'GLARE_API_URL', None)
if not endpoint:
try:
endpoint = base.url_for(request, "image")
endpoint = base.url_for(request, "artifact")
except exceptions.ServiceCatalogException:
endpoint = 'http://localhost:9292'
endpoint = 'http://localhost:9494'
LOG.warning('Glance API location could not be found in Service '
'Catalog, using default: {0}'.format(endpoint))
return endpoint
def artifactclient(request):
endpoint = _get_glance_endpoint(request)
insecure = getattr(settings, 'GLANCE_API_INSECURE', False)
endpoint = _get_glare_endpoint(request)
insecure = getattr(settings, 'GLARE_API_INSECURE', False)
token_id = request.user.token.id
return art_client.Client(endpoint=endpoint, token=token_id,
insecure=insecure, type_name='murano',

View File

@ -0,0 +1,7 @@
---
features:
- When using glare the endpoint for client is now 'artifact'
since glare has been moved to a separate service
upgrade:
- Parameters ``GLANCE_API_INSECURE`` and ``GLANCE_API_URL`` have been renamed to
``GLARE_API_INSECURE`` and ``GLARE_API_URL``.