cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[cloud][python3] bytes fix to make ec2_key work on python 3 (#23051)

Browse source
This commit is contained in:
Sloane Hertel 2017-03-28 17:00:26 -04:00 • committed by Ryan Brown
parent ea7bff4a3f
commit 7720ef8ec1
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/modules/cloud/amazon/ec2_key.py
View file

@ -117,6 +117,7 @@ try:
except ImportError: except ImportError:
HAS_BOTO = False HAS_BOTO = False
from ansible.module_utils._text import to_bytes
import random import random
import string import string
@ -226,7 +227,7 @@ def main():
if not module.check_mode: if not module.check_mode:
if key_material: if key_material:
'''We are providing the key, need to import''' '''We are providing the key, need to import'''
key = ec2.import_key_pair(name, key_material) key = ec2.import_key_pair(name, to_bytes(key_material))
else: else:
''' '''
No material provided, let AWS handle the key creation and No material provided, let AWS handle the key creation and