From 5e9783e72dcba79e8cb013e0e2b31128c3555896 Mon Sep 17 00:00:00 2001 From: Ekaterina Fedorova Date: Wed, 4 Dec 2013 18:12:20 +0400 Subject: [PATCH] Add version for metadata url Change-Id: I75b792ed6629a607aa5e7748c0c11e9881ddd998 --- muranodashboard/environments/services/metadata.py | 2 +- requirements.txt | 2 +- setup-centos.sh | 2 +- setup.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/muranodashboard/environments/services/metadata.py b/muranodashboard/environments/services/metadata.py index afe5576c2..d1d011c7c 100644 --- a/muranodashboard/environments/services/metadata.py +++ b/muranodashboard/environments/services/metadata.py @@ -44,7 +44,7 @@ def get_endpoint(request): try: endpoint = url_for(request, 'murano-metadata') except ServiceCatalogException: - endpoint = 'http://localhost:8084' + endpoint = 'http://localhost:8084/v1' log.warning( 'Murano Metadata API location could not be found in Service ' 'Catalog, using default: {0}'.format(endpoint)) diff --git a/requirements.txt b/requirements.txt index f78688b45..2327d9d96 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,4 @@ django-floppyforms==1.1 ordereddict yaql==0.2 python-muranoclient>=0.3 -murano-metadataclient==0.4.dev33.g89019e5 +murano-metadataclient==0.4.dev35.g5b1da5e diff --git a/setup-centos.sh b/setup-centos.sh index ab45d6af6..d4645bcba 100644 --- a/setup-centos.sh +++ b/setup-centos.sh @@ -116,7 +116,7 @@ LOGGING['handlers']['murano-file'] = {'level': 'DEBUG', 'formatter': 'verbose', LOGGING['loggers']['muranodashboard'] = {'handlers': ['murano-file'], 'level': 'DEBUG'} LOGGING['loggers']['muranoclient'] = {'handlers': ['murano-file'], 'level': 'ERROR'} #MURANO_API_URL = "http://localhost:8082" -#MURANO_METADATA_URL = "http://localhost:8084" +#MURANO_METADATA_URL = "http://localhost:8084/v1" #if murano-api set up with ssl uncomment next strings #MURANO_API_INSECURE = True #END_MURANO_DASHBOARD diff --git a/setup.sh b/setup.sh index 01a5947b7..51719bb79 100644 --- a/setup.sh +++ b/setup.sh @@ -96,7 +96,7 @@ LOGGING['handlers']['murano-file'] = {'level': 'DEBUG', 'formatter': 'verbose', LOGGING['loggers']['muranodashboard'] = {'handlers': ['murano-file'], 'level': 'DEBUG'} LOGGING['loggers']['muranoclient'] = {'handlers': ['murano-file'], 'level': 'ERROR'} #MURANO_API_URL = "http://localhost:8082" -#MURANO_METADATA_URL = "http://localhost:8084" +#MURANO_METADATA_URL = "http://localhost:8084/v1" #if murano-api set up with ssl uncomment next strings #MURANO_API_INSECURE = True #END_MURANO_DASHBOARD