Commit d7597414 by Matt Martz

Support keyring for the api_key

parent fe091ec0
...@@ -33,8 +33,11 @@ def setup_rax_module(module, rax_module): ...@@ -33,8 +33,11 @@ def setup_rax_module(module, rax_module):
rax_module.set_setting('identity_type', 'rackspace') rax_module.set_setting('identity_type', 'rackspace')
if api_key and username: if api_key and username:
rax_module.set_credentials(username, api_key=api_key, if api_key == 'USE_KEYRING':
region=region) rax_module.keyring_auth(username)
else:
rax_module.set_credentials(username, api_key=api_key,
region=region)
elif credentials: elif credentials:
credentials = os.path.expanduser(credentials) credentials = os.path.expanduser(credentials)
rax_module.set_credential_file(credentials, region=region) rax_module.set_credential_file(credentials, region=region)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment