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

Merge pull request #21123 from cro/saltcloud-pw-fail

Browse Source 
Don't omit password from salt-cloud kwargs if missing has_ssh_agent
This commit is contained in:
Joseph Hall 2015-02-27 10:49:53 -07:00
commit e4d7397c23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/utils/cloud.py
View File

@ -1005,7 +1005,7 @@ def deploy_script(host,
if key_filename: if key_filename:
log.debug('Using {0} as the key_filename'.format(key_filename)) log.debug('Using {0} as the key_filename'.format(key_filename))
ssh_kwargs['key_filename'] = key_filename ssh_kwargs['key_filename'] = key_filename
elif password and 'has_ssh_agent' in kwargs and kwargs['has_ssh_agent'] is False: elif password and kwargs.get('has_ssh_agent', False) is False:
log.debug('Using {0} as the password'.format(password)) log.debug('Using {0} as the password'.format(password))
ssh_kwargs['password'] = password ssh_kwargs['password'] = password