summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjonjozwiak <jonjozwiak@users.noreply.github.com>2017-09-28 20:22:00 -0500
committeransibot <ansibot@users.noreply.github.com>2017-09-28 21:21:59 -0400
commit74f950936a43ce13b6e15ebd92d6a829a7a88ea8 (patch)
treee77952a4c8eceedcb5acb723848d51ff4fb7ec12
parent057eec94ee3ae990fe63d4787f393d844d882509 (diff)
downloadansible-74f950936a43ce13b6e15ebd92d6a829a7a88ea8.tar.gz
Fix ec2_win_password to allow blank key_passphrase (#28791)
-rw-r--r--lib/ansible/modules/cloud/amazon/ec2_win_password.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ansible/modules/cloud/amazon/ec2_win_password.py b/lib/ansible/modules/cloud/amazon/ec2_win_password.py
index 78268bc0cc..ad7715defa 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_win_password.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_win_password.py
@@ -133,7 +133,10 @@ def main():
instance_id = module.params.get('instance_id')
key_file = module.params.get('key_file')
- b_key_passphrase = to_bytes(module.params.get('key_passphrase'), errors='surrogate_or_strict')
+ if module.params.get('key_passphrase') is None:
+ b_key_passphrase = None
+ else:
+ b_key_passphrase = to_bytes(module.params.get('key_passphrase'), errors='surrogate_or_strict')
wait = module.params.get('wait')
wait_timeout = int(module.params.get('wait_timeout'))