openstack
/
glance
Code Issues Proposed changes

Merge "Allow $OS_AUTH_URL environment variable to override config file value"

This commit is contained in:
Jenkins 2014-12-22 14:19:42 +00:00 committed by Gerrit Code Review
parent ccbad1bd8a 348cef70b9
commit 73551d3c26
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance/registry/client/v1/api.py
View File

@ -114,7 +114,7 @@ def configure_registry_admin_creds():
'password': CONF.admin_password,
'username': CONF.admin_user,
'tenant': CONF.admin_tenant_name,
'auth_url': CONF.auth_url,
'auth_url': os.getenv('OS_AUTH_URL') or CONF.auth_url,
'strategy': strategy,
'region': CONF.auth_region,
}

2
glance/registry/client/v2/api.py
View File

@ -95,7 +95,7 @@ def configure_registry_admin_creds():
'password': CONF.admin_password,
'username': CONF.admin_user,
'tenant': CONF.admin_tenant_name,
'auth_url': CONF.auth_url,
'auth_url': os.getenv('OS_AUTH_URL') or CONF.auth_url,
'strategy': strategy,
'region': CONF.auth_region,
}