saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Prevent stacktrace if something goes wrong retrieving inventory

Browse source
This commit is contained in:
C. R. Oldham 2015-11-17 15:39:57 -07:00
parent e7cbce15a5
commit 04095e3b74
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/grains/fx2.py
View file

@ -55,7 +55,7 @@ def _find_credentials():
return (u, p)
log.debug('grains fx2._find_credentials found no valid credentials, using Dell default')
logger.debug('grains fx2._find_credentials found no valid credentials, using Dell default')
return ('root', 'calvin')

6
salt/modules/dracr.py
View file

@ -243,6 +243,12 @@ def network_info(host=None,
inv = inventory(host=host, admin_username=admin_username,
admin_password=admin_password)
if inv is None:
cmd = {}
cmd['retcode'] = -1
cmd['stdout'] = 'Problem getting switch inventory'
return cmd
if module not in inv.get('switch'):
cmd = {}
cmd['retcode'] = -1