From 255c4b01a81649e4752f4241819e528b1974a1dc Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Thu, 28 Jan 2016 09:20:37 -0800 Subject: [PATCH] Remove duplicate documentation fields --- lib/ansible/modules/extras/cloud/amazon/dynamodb_table.py | 1 - .../modules/extras/cloud/cloudstack/cs_loadbalancer_rule.py | 5 ----- .../modules/extras/network/f5/bigip_virtual_server.py | 5 ++--- lib/ansible/modules/extras/notification/campfire.py | 1 - lib/ansible/modules/extras/notification/sns.py | 3 +-- lib/ansible/modules/extras/packaging/os/zypper.py | 1 - lib/ansible/modules/extras/windows/win_iis_webbinding.py | 6 ------ lib/ansible/modules/extras/windows/win_package.py | 1 - 8 files changed, 3 insertions(+), 20 deletions(-) diff --git a/lib/ansible/modules/extras/cloud/amazon/dynamodb_table.py b/lib/ansible/modules/extras/cloud/amazon/dynamodb_table.py index fb1d3cf40d8..c32c8d0e426 100644 --- a/lib/ansible/modules/extras/cloud/amazon/dynamodb_table.py +++ b/lib/ansible/modules/extras/cloud/amazon/dynamodb_table.py @@ -22,7 +22,6 @@ description: - Create or delete AWS Dynamo DB tables. - Can update the provisioned throughput on existing tables. - Returns the status of the specified table. -version_added: "2.0" author: Alan Loi (@loia) version_added: "2.0" requirements: diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_loadbalancer_rule.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_loadbalancer_rule.py index 713aaad0d45..297bc218b2d 100644 --- a/lib/ansible/modules/extras/cloud/cloudstack/cs_loadbalancer_rule.py +++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_loadbalancer_rule.py @@ -46,11 +46,6 @@ options: required: false choices: [ 'source', 'roundrobin', 'leastconn' ] default: 'source' - protocol: - description: - - Protocol for the load balancer rule. - required: false - default: null private_port: description: - The private port of the private ip address/virtual machine where the network traffic will be load balanced to. diff --git a/lib/ansible/modules/extras/network/f5/bigip_virtual_server.py b/lib/ansible/modules/extras/network/f5/bigip_virtual_server.py index 7e82e371775..a962693a2e0 100644 --- a/lib/ansible/modules/extras/network/f5/bigip_virtual_server.py +++ b/lib/ansible/modules/extras/network/f5/bigip_virtual_server.py @@ -65,12 +65,11 @@ options: state: description: - Virtual Server state - required: false - default: present - description: - Absent, delete the VS if present - present (and its synonym enabled), create if needed the VS and set state to enabled - disabled, create if needed the VS and set state to disabled + required: false + default: present choices: ['present', 'absent', 'enabled', 'disabled'] aliases: [] partition: diff --git a/lib/ansible/modules/extras/notification/campfire.py b/lib/ansible/modules/extras/notification/campfire.py index 68e64f1bc94..7615f551f7c 100644 --- a/lib/ansible/modules/extras/notification/campfire.py +++ b/lib/ansible/modules/extras/notification/campfire.py @@ -23,7 +23,6 @@ short_description: Send a message to Campfire description: - Send a message to Campfire. - Messages with newlines will result in a "Paste" message being sent. -version_added: "1.2" options: subscription: description: diff --git a/lib/ansible/modules/extras/notification/sns.py b/lib/ansible/modules/extras/notification/sns.py index 5fd81e2047f..6288ee86a30 100644 --- a/lib/ansible/modules/extras/notification/sns.py +++ b/lib/ansible/modules/extras/notification/sns.py @@ -24,7 +24,7 @@ short_description: Send Amazon Simple Notification Service (SNS) messages description: - The M(sns) module sends notifications to a topic on your Amazon SNS account version_added: 1.6 -author: "Michael J. Schultz (@mjschultz)" +author: "Michael J. Schultz (@mjschultz)" options: msg: description: @@ -78,7 +78,6 @@ options: aliases: ['aws_region', 'ec2_region'] requirements: [ "boto" ] -author: Michael J. Schultz """ EXAMPLES = """ diff --git a/lib/ansible/modules/extras/packaging/os/zypper.py b/lib/ansible/modules/extras/packaging/os/zypper.py index 78c2d489eaa..43e8919d5a2 100644 --- a/lib/ansible/modules/extras/packaging/os/zypper.py +++ b/lib/ansible/modules/extras/packaging/os/zypper.py @@ -79,7 +79,6 @@ options: notes: [] # informational: requirements for nodes requirements: [ zypper, rpm ] -author: Patrick Callahan ''' EXAMPLES = ''' diff --git a/lib/ansible/modules/extras/windows/win_iis_webbinding.py b/lib/ansible/modules/extras/windows/win_iis_webbinding.py index 061bed73723..0aa1ee12594 100644 --- a/lib/ansible/modules/extras/windows/win_iis_webbinding.py +++ b/lib/ansible/modules/extras/windows/win_iis_webbinding.py @@ -66,12 +66,6 @@ options: required: false default: null aliases: [] - protocol: - description: - - The protocol to be used for the Web binding (usually HTTP, HTTPS, or FTP). - required: false - default: null - aliases: [] certificate_hash: description: - Certificate hash for the SSL binding. The certificate hash is the unique identifier for the certificate. diff --git a/lib/ansible/modules/extras/windows/win_package.py b/lib/ansible/modules/extras/windows/win_package.py index 68497d5ba4f..946b730b97b 100644 --- a/lib/ansible/modules/extras/windows/win_package.py +++ b/lib/ansible/modules/extras/windows/win_package.py @@ -71,7 +71,6 @@ options: - Password of an account with access to the package if its located on a file share. Only needed if the winrm user doesn't have access to the package. Also specify user_name for this to function properly. default: null aliases: [] -author: Trond Hindenes ''' EXAMPLES = '''