valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better logic around fallback credentials.

Browse Source
This commit is contained in:
C. R. Oldham 2015-11-09 11:04:34 -07:00
parent 2701826a99
commit b86c614564
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
salt/proxy/fx2.py
View File

@ -197,11 +197,13 @@ def init(opts):
fallback_available = False
check_grains = _grains(DETAILS['host'], first_user, first_password)
if check_grains.get('retcode', 0) == 0:
if check_grains:
DETAILS['admin_username'] = opts['proxy']['admin_username']
DETAILS['admin_password'] = opts['proxy']['admin_password']
return True
elif fallback_available and _grains(DETAILS['host'], fallback_user, fallback_password).get('retcode', 0) == 0:
elif fallback_available and _grains(DETAILS['host'],
fallback_user,
fallback_password):
log.info('Fallback credentials used'
' to access chassis {0}'.format(opts['proxy']['host']))
DETAILS['admin_username'] = opts['proxy']['fallback_admin_username']
@ -233,13 +235,10 @@ def grains():
Get the grains from the proxied device
'''
if not GRAINS_CACHE:
r = _grains(DETAILS['host'],
DETAILS['admin_username'],
DETAILS['admin_password'])
if r.get('retcode', 0) == 0:
GRAINS_CACHE = r
else:
GRAINS_CACHE = {}
return _grains(DETAILS['host'],
DETAILS['admin_username'],
DETAILS['admin_password'])
return GRAINS_CACHE