From 12d76027df51d96f584972b9cae9699395d3de87 Mon Sep 17 00:00:00 2001 From: Rick Mendes Date: Fri, 26 Jun 2015 17:00:58 -0700 Subject: [PATCH] upgraded docs and argspec to match module guidelines --- cloud/amazon/ec2_win_password.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cloud/amazon/ec2_win_password.py b/cloud/amazon/ec2_win_password.py index 05aa67e3d29..d555ce625d3 100644 --- a/cloud/amazon/ec2_win_password.py +++ b/cloud/amazon/ec2_win_password.py @@ -7,7 +7,7 @@ short_description: gets the default administrator password for ec2 windows insta description: - Gets the default administrator password from any EC2 Windows instance. The instance is referenced by its id (e.g. i-XXXXXXX). This module has a dependency on python-boto. version_added: "2.0" -author: Rick Mendes +author: Rick Mendes(@rickmendes) options: instance_id: description: @@ -22,6 +22,7 @@ options: description: - The passphrase for the instance key pair. The key must use DES or 3DES encryption for this module to decrypt it. You can use openssl to convert your password protected keys if they do not use DES or 3DES. ex) openssl rsa -in current_key -out new_key -des3. required: false + default: null region: description: - The AWS region to use. Must be specified if ec2_url is not used. If not specified then the value of the EC2_REGION environment variable, if any, is used. @@ -39,6 +40,7 @@ options: version_added: "2.0" description: - Number of seconds to wait before giving up. + required: false default: 120 extends_documentation_fragment: aws @@ -93,9 +95,9 @@ def main(): argument_spec.update(dict( instance_id = dict(required=True), key_file = dict(required=True), - key_passphrase = dict(default=None), - wait = dict(type='bool', default=False), - wait_timeout = dict(default=120), + key_passphrase = dict(no_log=True, default=None, required=False), + wait = dict(type='bool', default=False, required=False), + wait_timeout = dict(default=120, required=False), ) ) module = AnsibleModule(argument_spec=argument_spec)