Merge "Allow $OS_AUTH_URL environment variable to override config file value"
This commit is contained in:
commit
73551d3c26
|
@ -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,
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue