From 35f8dbed35105f96be0a2b486fb960547b5d746c Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Tue, 19 Mar 2019 10:29:30 +0800 Subject: [PATCH] normalizing documentation before 2.8 (#54004) * normalizing documentation * fixed pep8 * a few more fixes --- .../modules/cloud/azure/azure_rm_dnszone.py | 4 +- .../modules/cloud/azure/azure_rm_image.py | 14 +++---- .../cloud/azure/azure_rm_networkinterface.py | 27 ++++++------ .../azure/azure_rm_networkinterface_facts.py | 8 ++-- .../azure/azure_rm_publicipaddress_facts.py | 2 +- .../cloud/azure/azure_rm_resourcegroup.py | 2 +- .../azure/azure_rm_resourcegroup_facts.py | 2 +- .../modules/cloud/azure/azure_rm_route.py | 4 +- .../cloud/azure/azure_rm_routetable.py | 12 +----- .../cloud/azure/azure_rm_routetable_facts.py | 2 +- .../cloud/azure/azure_rm_securitygroup.py | 18 ++++---- .../azure/azure_rm_securitygroup_facts.py | 16 +++---- .../cloud/azure/azure_rm_storageaccount.py | 2 +- .../azure/azure_rm_storageaccount_facts.py | 2 +- .../modules/cloud/azure/azure_rm_subnet.py | 16 +++---- .../cloud/azure/azure_rm_virtualmachine.py | 42 +++++++++---------- .../azure/azure_rm_virtualmachine_scaleset.py | 4 +- .../cloud/azure/azure_rm_virtualnetwork.py | 6 +-- .../azure/azure_rm_virtualnetwork_facts.py | 2 +- 19 files changed, 89 insertions(+), 96 deletions(-) diff --git a/lib/ansible/modules/cloud/azure/azure_rm_dnszone.py b/lib/ansible/modules/cloud/azure/azure_rm_dnszone.py index 971d605123..a67f13f2bc 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_dnszone.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_dnszone.py @@ -103,7 +103,7 @@ state: returned: always type: dict sample: { - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup", "location": "global", "name": "Testing", "name_servers": [ @@ -114,7 +114,7 @@ state: ], "number_of_record_sets": 2, "type": "private", - "resolution_virtual_networks": ["/subscriptions/XXXX/resourceGroups/Testing/providers/Microsoft.Network/virtualNetworks/foo"] + "resolution_virtual_networks": ["/subscriptions/XXXX/resourceGroup/myResourceGroup/providers/Microsoft.Network/virtualNetworks/foo"] } ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_image.py b/lib/ansible/modules/cloud/azure/azure_rm_image.py index 3ea3729026..b5dff335e4 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_image.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_image.py @@ -71,14 +71,14 @@ EXAMPLES = ''' - name: Create an image from a virtual machine azure_rm_image: resource_group: myResourceGroup - name: foobar - source: testvm001 + name: myImage + source: myVirtualMachine - name: Create an image from os disk azure_rm_image: resource_group: myResourceGroup - name: foobar - source: /subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Compute/disks/disk001 + name: myImage + source: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Compute/disks/disk001 data_disk_sources: - datadisk001 - datadisk002 @@ -87,7 +87,7 @@ EXAMPLES = ''' - name: Create an image from os disk via dict azure_rm_image: resource_group: myResourceGroup - name: foobar + name: myImage source: type: disks resource_group: myResourceGroup @@ -101,7 +101,7 @@ EXAMPLES = ''' azure_rm_image: state: absent resource_group: myResourceGroup - name: foobar + name: myImage source: testvm001 ''' @@ -110,7 +110,7 @@ id: description: Image resource path. type: str returned: success - example: "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Compute/images/foobar" + example: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Compute/images/myImage" ''' # NOQA from ansible.module_utils.azure_rm_common import AzureRMModuleBase, format_resource_id diff --git a/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py b/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py index d79710071b..7f04c4065d 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py @@ -219,7 +219,7 @@ EXAMPLES = ''' - name: Create a network interface with minimal parameters azure_rm_networkinterface: name: nic001 - resource_group: Testing + resource_group: myResourceGroup virtual_network: vnet001 subnet_name: subnet001 ip_configurations: @@ -230,7 +230,7 @@ EXAMPLES = ''' - name: Create a network interface with private IP address only (no Public IP) azure_rm_networkinterface: name: nic001 - resource_group: Testing + resource_group: myResourceGroup virtual_network: vnet001 subnet_name: subnet001 create_with_security_group: False @@ -241,12 +241,12 @@ EXAMPLES = ''' - name: Create a network interface for use in a Windows host (opens RDP port) with custom RDP port azure_rm_networkinterface: name: nic002 - resource_group: Testing + resource_group: myResourceGroup virtual_network: vnet001 subnet_name: subnet001 os_type: Windows rdp_port: 3399 - security_group: "/subscriptions/XXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/nsg001" + security_group: "/subscriptions/XXXXXXX/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/nsg001" ip_configurations: - name: ipconfig1 public_ip_address_name: publicip001 @@ -255,7 +255,7 @@ EXAMPLES = ''' - name: Create a network interface using existing security group and public IP azure_rm_networkinterface: name: nic003 - resource_group: Testing + resource_group: myResourceGroup virtual_network: vnet001 subnet_name: subnet001 security_group: secgroup001 @@ -267,7 +267,7 @@ EXAMPLES = ''' - name: Create a network with mutilple ip configurations azure_rm_networkinterface: name: nic004 - resource_group: Testing + resource_group: myResourceGroup subnet_name: subnet001 virtual_network: vnet001 security_group: @@ -286,7 +286,7 @@ EXAMPLES = ''' - name: Create a network interface in accelerated networking mode azure_rm_networkinterface: name: nic005 - resource_group: Testing + resource_group: myResourceGroup virtual_network_name: vnet001 subnet_name: subnet001 enable_accelerated_networking: True @@ -294,7 +294,7 @@ EXAMPLES = ''' - name: Create a network interface with IP forwarding azure_rm_networkinterface: name: nic001 - resource_group: Testing + resource_group: myResourceGroup virtual_network: vnet001 subnet_name: subnet001 ip_forwarding: True @@ -306,7 +306,7 @@ EXAMPLES = ''' - name: Create a network interface with dns servers azure_rm_networkinterface: name: nic009 - resource_group: Testing + resource_group: myResourceGroup virtual_network: vnet001 subnet_name: subnet001 dns_servers: @@ -314,7 +314,7 @@ EXAMPLES = ''' - name: Delete network interface azure_rm_networkinterface: - resource_group: Testing + resource_group: myResourceGroup name: nic003 state: absent ''' @@ -333,13 +333,14 @@ state: }, "enable_ip_forwarding": false, "etag": 'W/"be115a43-2148-4545-a324-f33ad444c926"', - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkInterfaces/nic003", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkInterfaces/nic003", "ip_configurations": [{ "name": "default", "private_ip_address": "10.1.0.10", "private_ip_allocation_method": "Static", "public_ip_address": { - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/publicIPAddresses/publicip001", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/publicIPAddresse + s/publicip001", "name": "publicip001" }, "subnet": {}, @@ -349,7 +350,7 @@ state: "mac_address": null, "name": "nic003", "network_security_group": { - "id": "/subscriptions//XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/nsg001", + "id": "/subscriptions//xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/nsg001", "name": "nsg001" }, "primary": null, diff --git a/lib/ansible/modules/cloud/azure/azure_rm_networkinterface_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_networkinterface_facts.py index 3ccf8e96bd..da72eae6c5 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_networkinterface_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_networkinterface_facts.py @@ -77,17 +77,17 @@ azure_networkinterfaces: }, "enable_ip_forwarding": false, "etag": 'W/"59726bfc-08c4-44ed-b900-f6a559876a9d"', - "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroups/Testing/providers/Microsoft.Network/networkInterfaces/nic003", + "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkInterfaces/nic003", "ip_configuration": { "name": "default", "private_ip_address": "10.10.0.4", "private_ip_allocation_method": "Dynamic", "public_ip_address": { - "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroups/Testing/providers/Microsoft.Network/publicIPAddresses/publicip001", + "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroup/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/publicip001", "name": "publicip001" }, "subnet": { - "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroups/Testing/providers/Microsoft.Network/virtualNetworks/vnet001/subnets/subnet001", + "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroup/myResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet001/subnets/subnet001", "name": "subnet001", "virtual_network_name": "vnet001" } @@ -96,7 +96,7 @@ azure_networkinterfaces: "mac_address": null, "name": "nic003", "network_security_group": { - "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/secgroup001", + "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/secgroup001", "name": "secgroup001" }, "primary": null, diff --git a/lib/ansible/modules/cloud/azure/azure_rm_publicipaddress_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_publicipaddress_facts.py index a6c2f96891..cafa89fce8 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_publicipaddress_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_publicipaddress_facts.py @@ -64,7 +64,7 @@ azure_publicipaddresses: type: list example: [{ "etag": 'W/"a31a6d7d-cb18-40a5-b16d-9f4a36c1b18a"', - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/publicIPAddresses/pip2001", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/pip2001", "location": "eastus2", "name": "pip2001", "properties": { diff --git a/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup.py b/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup.py index e8f6188293..1b3710a578 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup.py @@ -82,7 +82,7 @@ state: returned: always type: dict sample: { - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup", "location": "westus", "name": "Testing", "provisioning_state": "Succeeded", diff --git a/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup_facts.py index fe5af9f921..44fa89c856 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup_facts.py @@ -62,7 +62,7 @@ azure_resourcegroups: returned: always type: list example: [{ - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup", "location": "westus", "name": "Testing", "properties": { diff --git a/lib/ansible/modules/cloud/azure/azure_rm_route.py b/lib/ansible/modules/cloud/azure/azure_rm_route.py index 754766c13b..ed2a046502 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_route.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_route.py @@ -72,16 +72,16 @@ author: EXAMPLES = ''' - name: Create a route azure_rm_route: - name: foobar resource_group: myResourceGroup + name: myRoute address_prefix: 10.1.0.0/16 next_hop_type: virtual_network_gateway route_table_name: table - name: Delete a route azure_rm_route: - name: foobar resource_group: myResourceGroup + name: myRoute route_table_name: table state: absent ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_routetable.py b/lib/ansible/modules/cloud/azure/azure_rm_routetable.py index 40fa0dd355..1dc6180ba8 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_routetable.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_routetable.py @@ -59,24 +59,16 @@ author: EXAMPLES = ''' - name: Create a route table azure_rm_routetable: - name: foobar resource_group: myResourceGroup + name: myRouteTable disable_bgp_route_propagation: False tags: purpose: testing - - name: Update the subnet (idempotent) - azure_rm_subnet: - name: subnet - virtual_network_name: virtualnetwork - resource_group: myResourceGroup - address_prefix_cidr: "10.1.0.0/16" - route_table: foobar - - name: Delete a route table azure_rm_routetable: - name: foobar resource_group: myResourceGroup + name: myRouteTable state: absent ''' RETURN = ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_routetable_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_routetable_facts.py index 19cceba280..efc6661e2b 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_routetable_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_routetable_facts.py @@ -86,7 +86,7 @@ routes: type: list sample: [ { - "id": "/subscriptions/XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/routeTables/foobar/routes/route", + "id": "/subscriptions/XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX/resourceGroup/myResourceGroup/providers/Microsoft.Network/routeTables/foobar/routes/route", "name": "route", "resource_group": "Testing", "routeTables": "foobar", diff --git a/lib/ansible/modules/cloud/azure/azure_rm_securitygroup.py b/lib/ansible/modules/cloud/azure/azure_rm_securitygroup.py index 89fd1e77ad..d40158ee0a 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_securitygroup.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_securitygroup.py @@ -209,7 +209,7 @@ state: "destination_port_range": "*", "direction": "Inbound", "etag": 'W/"edf48d56-b315-40ca-a85d-dbcb47f2da7d"', - "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/AllowVnetInBound", + "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/AllowVnetInBound", "name": "AllowVnetInBound", "priority": 65000, "protocol": "*", @@ -224,7 +224,7 @@ state: "destination_port_range": "*", "direction": "Inbound", "etag": 'W/"edf48d56-b315-40ca-a85d-dbcb47f2da7d"', - "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/AllowAzureLoadBalancerInBound", + "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/AllowAzureLoadBalancerInBound", "name": "AllowAzureLoadBalancerInBound", "priority": 65001, "protocol": "*", @@ -239,7 +239,7 @@ state: "destination_port_range": "*", "direction": "Inbound", "etag": 'W/"edf48d56-b315-40ca-a85d-dbcb47f2da7d"', - "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/DenyAllInBound", + "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/DenyAllInBound", "name": "DenyAllInBound", "priority": 65500, "protocol": "*", @@ -254,7 +254,7 @@ state: "destination_port_range": "*", "direction": "Outbound", "etag": 'W/"edf48d56-b315-40ca-a85d-dbcb47f2da7d"', - "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/AllowVnetOutBound", + "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/AllowVnetOutBound", "name": "AllowVnetOutBound", "priority": 65000, "protocol": "*", @@ -269,7 +269,7 @@ state: "destination_port_range": "*", "direction": "Outbound", "etag": 'W/"edf48d56-b315-40ca-a85d-dbcb47f2da7d"', - "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/AllowInternetOutBound", + "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/AllowInternetOutBound", "name": "AllowInternetOutBound", "priority": 65001, "protocol": "*", @@ -284,7 +284,7 @@ state: "destination_port_range": "*", "direction": "Outbound", "etag": 'W/"edf48d56-b315-40ca-a85d-dbcb47f2da7d"', - "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/DenyAllOutBound", + "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/DenyAllOutBound", "name": "DenyAllOutBound", "priority": 65500, "protocol": "*", @@ -293,7 +293,7 @@ state: "source_port_range": "*" } ], - "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/mysecgroup", + "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup", "location": "westus", "name": "mysecgroup", "network_interfaces": [], @@ -305,7 +305,7 @@ state: "destination_port_range": "22", "direction": "Inbound", "etag": 'W/"edf48d56-b315-40ca-a85d-dbcb47f2da7d"', - "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/securityRules/DenySSH", + "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/securityRules/DenySSH", "name": "DenySSH", "priority": 100, "protocol": "Tcp", @@ -320,7 +320,7 @@ state: "destination_port_range": "22", "direction": "Inbound", "etag": 'W/"edf48d56-b315-40ca-a85d-dbcb47f2da7d"', - "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/securityRules/AllowSSH", + "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/securityRules/AllowSSH", "name": "AllowSSH", "priority": 101, "protocol": "Tcp", diff --git a/lib/ansible/modules/cloud/azure/azure_rm_securitygroup_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_securitygroup_facts.py index 9b6e8fa6c7..6b50748d4f 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_securitygroup_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_securitygroup_facts.py @@ -65,14 +65,14 @@ azure_securitygroups: type: list example: [{ "etag": 'W/"d036f4d7-d977-429a-a8c6-879bc2523399"', - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/secgroup001", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/secgroup001", "location": "eastus2", "name": "secgroup001", "properties": { "defaultSecurityRules": [ { "etag": 'W/"d036f4d7-d977-429a-a8c6-879bc2523399"', - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/secgroup001/defaultSecurityRules/AllowVnetInBound", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/secgroup001/defaultSecurityRules/AllowVnetInBound", "name": "AllowVnetInBound", "properties": { "access": "Allow", @@ -89,7 +89,7 @@ azure_securitygroups: }, { "etag": 'W/"d036f4d7-d977-429a-a8c6-879bc2523399"', - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/secgroup001/defaultSecurityRules/AllowAzureLoadBalancerInBound", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/secgroup001/defaultSecurityRules/AllowAzureLoadBalancerInBound", "name": "AllowAzureLoadBalancerInBound", "properties": { "access": "Allow", @@ -106,7 +106,7 @@ azure_securitygroups: }, { "etag": 'W/"d036f4d7-d977-429a-a8c6-879bc2523399"', - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/secgroup001/defaultSecurityRules/DenyAllInBound", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/secgroup001/defaultSecurityRules/DenyAllInBound", "name": "DenyAllInBound", "properties": { "access": "Deny", @@ -123,7 +123,7 @@ azure_securitygroups: }, { "etag": 'W/"d036f4d7-d977-429a-a8c6-879bc2523399"', - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/secgroup001/defaultSecurityRules/AllowVnetOutBound", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/secgroup001/defaultSecurityRules/AllowVnetOutBound", "name": "AllowVnetOutBound", "properties": { "access": "Allow", @@ -140,7 +140,7 @@ azure_securitygroups: }, { "etag": 'W/"d036f4d7-d977-429a-a8c6-879bc2523399"', - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/secgroup001/defaultSecurityRules/AllowInternetOutBound", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/secgroup001/defaultSecurityRules/AllowInternetOutBound", "name": "AllowInternetOutBound", "properties": { "access": "Allow", @@ -157,7 +157,7 @@ azure_securitygroups: }, { "etag": 'W/"d036f4d7-d977-429a-a8c6-879bc2523399"', - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/secgroup001/defaultSecurityRules/DenyAllOutBound", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/secgroup001/defaultSecurityRules/DenyAllOutBound", "name": "DenyAllOutBound", "properties": { "access": "Deny", @@ -175,7 +175,7 @@ azure_securitygroups: ], "networkInterfaces": [ { - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkInterfaces/nic004" + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkInterfaces/nic004" } ], "provisioningState": "Succeeded", diff --git a/lib/ansible/modules/cloud/azure/azure_rm_storageaccount.py b/lib/ansible/modules/cloud/azure/azure_rm_storageaccount.py index 31d3555812..864254eb91 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_storageaccount.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_storageaccount.py @@ -181,7 +181,7 @@ state: sample: { "account_type": "Standard_RAGRS", "custom_domain": null, - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/testing/providers/Microsoft.Storage/storageAccounts/clh0003", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testing/providers/Microsoft.Storage/storageAccounts/clh0003", "location": "eastus2", "name": "clh0003", "primary_endpoints": { diff --git a/lib/ansible/modules/cloud/azure/azure_rm_storageaccount_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_storageaccount_facts.py index 941bbf33dd..f44948d213 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_storageaccount_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_storageaccount_facts.py @@ -82,7 +82,7 @@ azure_storageaccounts: returned: always type: list example: [{ - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/testing/providers/Microsoft.Storage/storageAccounts/testaccount001", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testing/providers/Microsoft.Storage/storageAccounts/testaccount001", "location": "eastus2", "name": "testaccount001", "properties": { diff --git a/lib/ansible/modules/cloud/azure/azure_rm_subnet.py b/lib/ansible/modules/cloud/azure/azure_rm_subnet.py index c1d50c6ba3..1d84f23b20 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_subnet.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_subnet.py @@ -96,16 +96,16 @@ author: EXAMPLES = ''' - name: Create a subnet azure_rm_subnet: - name: foobar - virtual_network_name: My_Virtual_Network resource_group: myResourceGroup + virtual_network_name: myVirtualNetwork + name: mySubnet address_prefix_cidr: "10.1.0.0/24" - name: Create a subnet refer nsg from other resource group azure_rm_subnet: - name: foobar - virtual_network_name: My_Virtual_Network resource_group: myResourceGroup + virtual_network_name: myVirtualNetwork + name: mySubnet address_prefix_cidr: "10.1.0.0/16" security_group: name: secgroupfoo @@ -114,9 +114,9 @@ EXAMPLES = ''' - name: Delete a subnet azure_rm_subnet: - name: foobar - virtual_network_name: My_Virtual_Network resource_group: myResourceGroup + virtual_network_name: myVirtualNetwork + name: mySubnet state: absent ''' @@ -133,7 +133,7 @@ state: id: description: Subnet resource path. type: str - example: "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/virtualNetworks/My_Virtual_Network/subnets/foobar" + example: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/mySubnet" name: description: Subnet name. type: str @@ -144,7 +144,7 @@ state: id: description: Security group resource identifier. type: str - example: "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkSecurityGroups/secgroupfoo" + example: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/secgroupfoo" name: description: Name of the security group. type: str diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py index a5a504394f..5909683ce6 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py @@ -327,7 +327,7 @@ EXAMPLES = ''' - name: Create VM with defaults azure_rm_virtualmachine: - resource_group: Testing + resource_group: myResourceGroup name: testvm10 admin_username: chouseknecht admin_password: @@ -340,14 +340,14 @@ EXAMPLES = ''' - name: Create an availability set for managed disk vm azure_rm_availabilityset: name: avs-managed-disk - resource_group: Testing + resource_group: myResourceGroup platform_update_domain_count: 5 platform_fault_domain_count: 2 sku: Aligned - name: Create a VM with managed disk azure_rm_virtualmachine: - resource_group: Testing + resource_group: myResourceGroup name: vm-managed-disk admin_username: adminUser availability_set: avs-managed-disk @@ -361,7 +361,7 @@ EXAMPLES = ''' - name: Create a VM with existing storage account and NIC azure_rm_virtualmachine: - resource_group: Testing + resource_group: myResourceGroup name: testvm002 vm_size: Standard_D4 storage_account: testaccount001 @@ -378,7 +378,7 @@ EXAMPLES = ''' - name: Create a VM with OS and multiple data managed disks azure_rm_virtualmachine: - resource_group: Testing + resource_group: myResourceGroup name: testvm001 vm_size: Standard_D4 managed_disk_type: Standard_LRS @@ -401,7 +401,7 @@ EXAMPLES = ''' - name: Create a VM with OS and multiple data storage accounts azure_rm_virtualmachine: - resource_group: Testing + resource_group: myResourceGroup name: testvm001 vm_size: Standard_DS1_v2 admin_username: adminUser @@ -429,7 +429,7 @@ EXAMPLES = ''' - name: Create a VM with a custom image azure_rm_virtualmachine: - resource_group: Testing + resource_group: myResourceGroup name: testvm001 vm_size: Standard_DS1_v2 admin_username: adminUser @@ -438,18 +438,18 @@ EXAMPLES = ''' - name: Create a VM with a custom image from a particular resource group azure_rm_virtualmachine: - resource_group: Testing + resource_group: myResourceGroup name: testvm001 vm_size: Standard_DS1_v2 admin_username: adminUser admin_password: password01 image: name: customimage001 - resource_group: Testing + resource_group: myResourceGroup - name: Create VM with spcified OS disk size azure_rm_virtualmachine: - resource_group: Testing + resource_group: myResourceGroup name: big-os-disk admin_username: chouseknecht admin_password: @@ -462,7 +462,7 @@ EXAMPLES = ''' - name: Create VM with OS and Plan, accepting the terms azure_rm_virtualmachine: - resource_group: Testing + resource_group: myResourceGroup name: f5-nva admin_username: chouseknecht admin_password: @@ -478,13 +478,13 @@ EXAMPLES = ''' - name: Power Off azure_rm_virtualmachine: - resource_group: Testing + resource_group: myResourceGroup name: testvm002 started: no - name: Deallocate azure_rm_virtualmachine: - resource_group: Testing + resource_group: myResourceGroup name: testvm002 allocated: no @@ -501,7 +501,7 @@ EXAMPLES = ''' - name: Create a VM with an Availability Zone azure_rm_virtualmachine: - resource_group: Testing + resource_group: myResourceGroup name: testvm001 vm_size: Standard_DS1_v2 admin_username: adminUser @@ -511,7 +511,7 @@ EXAMPLES = ''' - name: Remove a VM and all resources that were autocreated azure_rm_virtualmachine: - resource_group: Testing + resource_group: myResourceGroup name: testvm002 remove_on_absent: all_autocreated state: absent @@ -545,7 +545,7 @@ azure_vm: contains: { "properties": { "availabilitySet": { - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Compute/availabilitySets/MYAVAILABILITYSET" + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Compute/availabilitySets/MYAVAILABILITYSET" }, "hardwareProfile": { "vmSize": "Standard_D1" @@ -594,7 +594,7 @@ azure_vm: "networkProfile": { "networkInterfaces": [ { - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkInterfaces/testvm10_NIC01", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkInterfaces/testvm10_NIC01", "name": "testvm10_NIC01", "properties": { "dnsSettings": { @@ -605,20 +605,20 @@ azure_vm: "ipConfigurations": [ { "etag": 'W/"041c8c2a-d5dd-4cd7-8465-9125cfbe2cf8"', - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkInterfaces/testvm10_NIC01/ipConfigurations/default", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkInterfaces/testvm10_NIC01/ipConfigurations/default", "name": "default", "properties": { "privateIPAddress": "10.10.0.5", "privateIPAllocationMethod": "Dynamic", "provisioningState": "Succeeded", "publicIPAddress": { - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/publicIPAddresses/testvm10_PIP01", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/testvm10_PIP01", "name": "testvm10_PIP01", "properties": { "idleTimeoutInMinutes": 4, "ipAddress": "13.92.246.197", "ipConfiguration": { - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/networkInterfaces/testvm10_NIC01/ipConfigurations/default" + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkInterfaces/testvm10_NIC01/ipConfigurations/default" }, "provisioningState": "Succeeded", "publicIPAllocationMethod": "Static", @@ -633,7 +633,7 @@ azure_vm: "provisioningState": "Succeeded", "resourceGuid": "10979e12-ccf9-42ee-9f6d-ff2cc63b3844", "virtualMachine": { - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Compute/virtualMachines/testvm10" + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Compute/virtualMachines/testvm10" } } } diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_scaleset.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_scaleset.py index 5f02155da2..ea5038fc77 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_scaleset.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_scaleset.py @@ -276,7 +276,7 @@ EXAMPLES = ''' managed_disk_type: Standard_LRS image: name: customimage001 - resource_group: Testing + resource_group: myResourceGroup ''' RETURN = ''' @@ -307,7 +307,7 @@ azure_vmss: "properties": { "privateIPAddressVersion": "IPv4", "subnet": { - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet" + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet" } } } diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork.py index ae4ecf2343..2963886a7d 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork.py @@ -81,8 +81,8 @@ author: EXAMPLES = ''' - name: Create a virtual network azure_rm_virtualnetwork: - name: foobar resource_group: myResourceGroup + name: myVirtualNetwork address_prefixes_cidr: - "10.1.0.0/16" - "172.100.0.0/16" @@ -95,8 +95,8 @@ EXAMPLES = ''' - name: Delete a virtual network azure_rm_virtualnetwork: - name: foobar resource_group: myResourceGroup + name: myVirtualNetwork state: absent ''' RETURN = ''' @@ -114,7 +114,7 @@ state: "127.0.0.3" ], "etag": 'W/"0712e87c-f02f-4bb3-8b9e-2da0390a3886"', - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/virtualNetworks/my_test_network", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork", "location": "eastus", "name": "my_test_network", "provisioning_state": "Succeeded", diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork_facts.py index 60ab812378..1e41f15977 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork_facts.py @@ -67,7 +67,7 @@ azure_virtualnetworks: type: list example: [{ "etag": 'W/"532ba1be-ae71-40f2-9232-3b1d9cf5e37e"', - "id": "/subscriptions/XXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXX/resourceGroups/Testing/providers/Microsoft.Network/virtualNetworks/vnet2001", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet2001", "location": "eastus2", "name": "vnet2001", "properties": {