cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Only specify to USE_KEYRING as the api_key/password when we actually got a keyring_username from ~/.pyrax.cfg

Browse source
This commit is contained in:
Matt Martz 2014-01-24 11:40:34 -06:00
parent 1ac7dffd55
commit 021b926235
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/module_utils/rax.py
View file

@ -45,7 +45,8 @@ def setup_rax_module(module, rax_module):
username = username or os.environ.get('RAX_USERNAME')
if not username:
username = rax_module.get_setting('keyring_username')
api_key = 'USE_KEYRING'
if username:
api_key = 'USE_KEYRING'
if not api_key:
api_key = os.environ.get('RAX_API_KEY')
credentials = (credentials or os.environ.get('RAX_CREDENTIALS') or