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 #48212 from Ch3LL/py3_ec2

Browse Source 
Fix python3 ec2 salt-cloud TypeError when installing salt
This commit is contained in:
Nicole Thomas 2018-06-20 12:00:20 -04:00 committed by GitHub
commit 77a75ebdcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/cloud/clouds/ec2.py
View File

@ -2421,7 +2421,7 @@ def wait_for_instance(
) )
pprint.pprint(console) pprint.pprint(console)
time.sleep(5) time.sleep(5)
output = console['output_decoded'] output = salt.utils.stringutils.to_unicode(console['output_decoded'])
comps = output.split('-----BEGIN SSH HOST KEY KEYS-----') comps = output.split('-----BEGIN SSH HOST KEY KEYS-----')
if len(comps) < 2: if len(comps) < 2:
# Fail; there are no host keys # Fail; there are no host keys