Merge pull request #10667 from endyman/fix_for_keydeploy

fix for broken salt-ssh key_deploy
This commit is contained in:
Erik Johnson 2014-02-22 20:24:44 -08:00
commit 08eb99c45b

View File

@ -204,7 +204,7 @@ class SSH(object):
)
pub = '{0}.pub'.format(priv)
with open(pub, 'r') as fp_:
return '{0} root@master'.format(fp_.read().split()[1])
return '{0} rsa root@master'.format(fp_.read().split()[1])
def key_deploy(self, host, ret):
'''