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

Merge pull request #35868 from rallytime/fix-35825

Browse source 
Add more helpful return messages for drac runner
This commit is contained in:
Mike Place 2016-08-31 10:33:27 +09:00 • committed by GitHub
commit ca06c62900
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
salt/runners/drac.py
View file

@ -5,11 +5,12 @@ Manage Dell DRAC from the Master
The login credentials need to be configured in the Salt master
configuration file.
.. code-block: yaml
.. code-block: yaml
drac:
username: admin
password: secret
drac:
username: admin
password: secret
'''
# Import python libs
@ -30,18 +31,28 @@ def __virtual__():
if HAS_PARAMIKO:
return True
return False
return False, 'The drac runner module cannot be loaded: paramiko package is not installed.'
def __connect(hostname, timeout=20, username=None, password=None):
'''
Connect to the DRAC
'''
drac_cred = __opts__.get('drac')
err_msg = 'No drac login credentials found. Please add the \'username\' and \'password\' ' \
'fields beneath a \'drac\' key in the master configuration file. Or you can ' \
'pass in a username and password as kwargs at the CLI.'
if not username:
username = __opts__['drac'].get('username', None)
if drac_cred is None:
log.error(err_msg)
return False
username = drac_cred.get('username', None)
if not password:
password = __opts__['drac'].get('password', None)
if drac_cred is None:
log.error(err_msg)
return False
password = drac_cred.get('password', None)
client = paramiko.SSHClient()
client.set_missing_host_key_policy(paramiko.AutoAddPolicy())