Add configurable timeout and debug flags to Keystone users

Fixes #1855
This commit is contained in:
Joseph Schorr 2016-09-22 18:25:02 -04:00
parent bfaa46c499
commit fd770422bb
2 changed files with 12 additions and 4 deletions

View file

@ -59,11 +59,12 @@ def get_users_handler(config, config_provider, override_config_dir):
if authentication_type == 'Keystone':
auth_url = config.get('KEYSTONE_AUTH_URL')
timeout = config.get('KEYSTONE_AUTH_TIMEOUT')
keystone_admin_username = config.get('KEYSTONE_ADMIN_USERNAME')
keystone_admin_password = config.get('KEYSTONE_ADMIN_PASSWORD')
keystone_admin_tenant = config.get('KEYSTONE_ADMIN_TENANT')
return KeystoneUsers(auth_url, keystone_admin_username, keystone_admin_password,
keystone_admin_tenant)
keystone_admin_tenant, timeout)
raise RuntimeError('Unknown authentication type: %s' % authentication_type)