From 0ba37906df42cf13f2f04d789e8c659a09739bd4 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Mon, 25 Apr 2016 09:43:12 -0400 Subject: [PATCH] minor doc fixes --- .../cloud/azure/azure_rm_networkinterface.py | 7 +------ .../modules/cloud/azure/azure_rm_resourcegroup.py | 14 ++------------ .../modules/cloud/azure/azure_rm_securitygroup.py | 10 +--------- .../modules/cloud/azure/azure_rm_storageaccount.py | 11 +---------- .../modules/cloud/azure/azure_rm_storageblob.py | 9 --------- lib/ansible/modules/cloud/azure/azure_rm_subnet.py | 11 +---------- .../modules/cloud/azure/azure_rm_virtualnetwork.py | 11 +---------- 7 files changed, 7 insertions(+), 66 deletions(-) diff --git a/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py b/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py index a6be5717c49..36b323135a9 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py @@ -198,13 +198,8 @@ EXAMPLES = ''' ''' RETURN = ''' -changed: - description: Whether or not the object was changed. - returned: always - type: bool - sample: True state: - description: Facts about the current state of the object. + description: The current state of the network interface. returned: always type: dict sample: { diff --git a/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup.py b/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup.py index 775c40d2371..612c9a5b69a 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup.py @@ -22,14 +22,10 @@ DOCUMENTATION = ''' --- module: azure_rm_resourcegroup - version_added: "2.1" - short_description: Manage Azure resource groups. - description: - Create, update and delete a resource group. - options: force: description: @@ -47,7 +43,6 @@ options: description: - Name of the resource group. required: true - default: null state: description: - Assert the state of the resource group. Use 'present' to create or update and @@ -95,17 +90,12 @@ EXAMPLES = ''' state: absent ''' RETURN = ''' -changed: - description: Whether or not the object was changed. - returned: always - type: bool - sample: True contains_resources: description: Whether or not the resource group contains associated resources. type: bool sample: True state: - description: Facts about the current state of the object. + description: Current state of the resource group. returned: always type: dict sample: { @@ -143,7 +133,7 @@ def resource_group_to_dict(rg): class AzureRMResourceGroup(AzureRMModuleBase): - + def __init__(self): self.module_arg_spec = dict( name=dict(type='str', required=True), diff --git a/lib/ansible/modules/cloud/azure/azure_rm_securitygroup.py b/lib/ansible/modules/cloud/azure/azure_rm_securitygroup.py index 91f534a9b1f..394072fc482 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_securitygroup.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_securitygroup.py @@ -22,11 +22,8 @@ DOCUMENTATION = ''' --- module: azure_rm_securitygroup - version_added: "2.1" - short_description: Manage Azure network security groups. - description: - Create, update or delete a network security group. A security group contains Access Control List (ACL) rules that allow or deny network traffic to subnets or individual network interfaces. A security group is created @@ -195,13 +192,8 @@ EXAMPLES = ''' ''' RETURN = ''' -changed: - description: Whether or not the object was changed. - returned: always - type: bool - sample: True state: - description: Facts about the current state of the object. + description: Current state of the security group. returned: always type: dict sample: { diff --git a/lib/ansible/modules/cloud/azure/azure_rm_storageaccount.py b/lib/ansible/modules/cloud/azure/azure_rm_storageaccount.py index 1557ea11511..b9c99637307 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_storageaccount.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_storageaccount.py @@ -23,14 +23,10 @@ DOCUMENTATION = ''' --- module: azure_rm_storageaccount - version_added: "2.1" - short_description: Manage Azure storage accounts. - description: - Create, update or delete a storage account. - options: resource_group: description: @@ -119,13 +115,8 @@ EXAMPLES = ''' RETURN = ''' -changed: - description: Whether or not the object was changed. - returned: always - type: bool - sample: True state: - description: Facts about the current state of the object. + description: Current state of the storage account. returned: always type: dict sample: { diff --git a/lib/ansible/modules/cloud/azure/azure_rm_storageblob.py b/lib/ansible/modules/cloud/azure/azure_rm_storageblob.py index 10576928ea9..3d7424c2b98 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_storageblob.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_storageblob.py @@ -22,15 +22,11 @@ DOCUMENTATION = ''' --- module: azure_rm_storageblob - short_description: Manage blob containers and blob objects. - version_added: "2.1" - description: - Create, update and delete blob containers and blob objects. Use to upload a file and store it as a blob object, or download a blob object to a file. - options: storage_account_name: description: @@ -180,11 +176,6 @@ EXAMPLES = ''' ''' RETURN = ''' -changed: - description: Whether or not the object was changed. - returned: always - type: bool - sample: True actions: description: List of descriptive actions taken by the module. returned: always diff --git a/lib/ansible/modules/cloud/azure/azure_rm_subnet.py b/lib/ansible/modules/cloud/azure/azure_rm_subnet.py index 08ade443cb7..f9d0f6edd56 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_subnet.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_subnet.py @@ -22,16 +22,12 @@ DOCUMENTATION = ''' --- module: azure_rm_subnet - version_added: "2.1" - short_description: Manage Azure subnets. - description: - Create, update or delete a subnet within a given virtual network. Allows setting and updating the address prefix CIDR, which must be valid within the context of the virtual network. Use the azure_rm_networkinterface module to associate interfaces with the subnet and assign specific IP addresses. - options: resource_group: description: @@ -97,13 +93,8 @@ EXAMPLES = ''' ''' RETURN = ''' -changed: - description: Whether or not the object was changed. - returned: always - type: bool - sample: True state: - description: Facts about the current state of the object. + description: Current state of the subnet. returned: always type: dict sample: { diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork.py index bd011e3dd61..d4b2d0b1964 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork.py @@ -23,15 +23,11 @@ DOCUMENTATION = ''' --- module: azure_rm_virtualnetwork - version_added: "2.1" - short_description: Manage Azure virtual networks. - description: - Create, update or delete a virtual networks. Allows setting and updating the available IPv4 address ranges and setting custom DNS servers. Use the azure_rm_subnet module to associate subnets with a virtual network. - options: resource_group: description: @@ -125,13 +121,8 @@ EXAMPLES = ''' state: absent ''' RETURN = ''' -changed: - description: Whether or not the object was changed. - returned: always - type: bool - sample: True state: - description: Facts about the current state of the object. + description: Current state of the virtual network. returned: always type: dict sample: {