From eb7f058a9834544d0180d4375560fdcbf8b68784 Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Thu, 21 Mar 2019 17:01:51 +0800 Subject: [PATCH] more doc improvements (#54148) --- .../modules/cloud/azure/azure_rm_aks.py | 4 +-- .../cloud/azure/azure_rm_autoscale_facts.py | 2 +- .../cloud/azure/azure_rm_cdnprofile.py | 2 +- .../azure/azure_rm_containerinstance_facts.py | 12 +++---- .../cloud/azure/azure_rm_cosmosdbaccount.py | 10 +++--- .../cloud/azure/azure_rm_devtestlab_facts.py | 12 +++---- .../azure/azure_rm_dnsrecordset_facts.py | 33 +++++++++---------- .../cloud/azure/azure_rm_functionapp.py | 21 ++++++------ .../cloud/azure/azure_rm_networkinterface.py | 3 +- .../azure/azure_rm_networkinterface_facts.py | 8 ++--- .../cloud/azure/azure_rm_routetable_facts.py | 2 +- .../cloud/azure/azure_rm_securitygroup.py | 18 +++++----- .../cloud/azure/azure_rm_sqldatabase.py | 6 ++-- .../cloud/azure/azure_rm_storageaccount.py | 2 +- .../azure/azure_rm_storageaccount_facts.py | 2 +- .../azure/azure_rm_trafficmanagerendpoint.py | 3 +- .../azure/azure_rm_trafficmanagerprofile.py | 8 +++-- .../azure/azure_rm_virtualnetworkpeering.py | 13 ++++---- .../modules/cloud/azure/azure_rm_webapp.py | 2 +- 19 files changed, 85 insertions(+), 78 deletions(-) diff --git a/lib/ansible/modules/cloud/azure/azure_rm_aks.py b/lib/ansible/modules/cloud/azure/azure_rm_aks.py index f21f60a0ada..0bed80a0751 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_aks.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_aks.py @@ -244,7 +244,7 @@ state: vnet_subnet_id: Null changed: false dns_prefix: aks9860bdcd89 - id: "/subscriptions/XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX/resourcegroups/yuwzhoaks/providers/Microsoft.ContainerService/managedClusters/aks9860bdc" + id: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourcegroups/yuwzhoaks/providers/Microsoft.ContainerService/managedClusters/aks9860bdc" kube_config: "......" kubernetes_version: 1.11.4 linux_profile: @@ -254,7 +254,7 @@ state: name: aks9860bdc provisioning_state: Succeeded service_principal_profile: - client_id: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX + client_id: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx tags: {} type: Microsoft.ContainerService/ManagedClusters ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_autoscale_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_autoscale_facts.py index 1a59f2c4439..3fbd53574da 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_autoscale_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_autoscale_facts.py @@ -59,7 +59,7 @@ autoscales: type: list sample: [{ "enabled": true, - "id": "/subscriptions/XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX/resourceGroups/myResourceGroup/providers/microsoft.insights/autoscalesettings/scale", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/microsoft.insights/autoscalesettings/scale", "location": "eastus", "name": "scale", "notifications": [ diff --git a/lib/ansible/modules/cloud/azure/azure_rm_cdnprofile.py b/lib/ansible/modules/cloud/azure/azure_rm_cdnprofile.py index 65156fb38f8..793ee158b06 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_cdnprofile.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_cdnprofile.py @@ -80,7 +80,7 @@ id: returned: always type: dict example: - id: /subscriptions/XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX/resourcegroups/cdntest/providers/Microsoft.Cdn/profiles/cdntest + id: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourcegroups/cdntest/providers/Microsoft.Cdn/profiles/cdntest ''' from ansible.module_utils.azure_rm_common import AzureRMModuleBase diff --git a/lib/ansible/modules/cloud/azure/azure_rm_containerinstance_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_containerinstance_facts.py index 2680e5379cd..369df2fcb36 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_containerinstance_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_containerinstance_facts.py @@ -63,8 +63,8 @@ container_groups: - The resource id. returned: always type: str - sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/my - containers" + sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ContainerInstance/contain + erGroups/myContainer" resource_group: description: - Resource group where the container exists. @@ -119,15 +119,15 @@ container_groups: - The name of the container instance. returned: always type: str - sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/my - containers" + sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ContainerInstance + /containerGroups/myContainer" image: description: - The container image name. returned: always type: str - sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/demo/providers/Microsoft.ContainerInstance/containerGroups/my - containers" + sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ContainerInstance + /containerGroups/myContainer" memory: description: - The required memory of the containers in GB. diff --git a/lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount.py b/lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount.py index f0c7c6e34ac..daf106c9f22 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount.py @@ -148,7 +148,7 @@ EXAMPLES = ''' - name: Create Cosmos DB Account - min azure_rm_cosmosdbaccount: resource_group: myResourceGroup - name: ddb1 + name: myDatabaseAccount location: westus geo_rep_locations: - name: southcentralus @@ -158,7 +158,7 @@ EXAMPLES = ''' - name: Create Cosmos DB Account - max azure_rm_cosmosdbaccount: resource_group: myResourceGroup - name: ddb1 + name: myDatabaseAccount location: westus kind: mongo_db geo_rep_locations: @@ -168,7 +168,8 @@ EXAMPLES = ''' ip_range_filter: 10.10.10.10 enable_multiple_write_locations: yes virtual_network_rules: - - subnet: /subscriptions/subId/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1 + - subnet: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVi + rtualNetwork/subnets/mySubnet" consistency_policy: default_consistency_level: bounded_staleness max_staleness_prefix: 10 @@ -181,7 +182,8 @@ id: - The unique resource identifier of the database account. returned: always type: str - sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.DocumentDB/databaseAccounts/ddb1 + sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.DocumentDB/databaseAccounts/myData + baseAccount" ''' import time diff --git a/lib/ansible/modules/cloud/azure/azure_rm_devtestlab_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_devtestlab_facts.py index 533ad2a0205..a19f1da18e9 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_devtestlab_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_devtestlab_facts.py @@ -64,7 +64,7 @@ labs: - The identifier of the resource. returned: always type: str - sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourcegroups/testrg/providers/microsoft.devtestlab/labs/testlab + sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourcegroups/myResourceGroup/providers/microsoft.devtestlab/labs/myLab resource_group: description: - The name of the resource. @@ -106,31 +106,31 @@ labs: - Artifacts storage account ID. returned: always type: str - sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testrg/providers/Microsoft.Storage/storageAccounts/testlab6346 + sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/myLab6346 default_premium_storage_account: description: - Default premium storage account ID. returned: always type: str - sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testrg/providers/Microsoft.Storage/storageAccounts/testlab6346 + sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/myLab6346 default_storage_account: description: - Default storage account ID. returned: always type: str - sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testrg/providers/Microsoft.Storage/storageAccounts/testlab6346 + sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/myLab6346 premium_data_disk_storage_account: description: - Default storage account ID. returned: always type: str - sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testrg/providers/Microsoft.Storage/storageAccounts/testlab6346 + sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Storage/storageAccounts/myLab6346 vault_name: description: - Key vault ID. returned: always type: str - sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testrg/providers/Microsoft.KeyVault/vaults/testlab6788 + sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.KeyVault/vaults/myLab6788 tags: description: - The tags of the resource. diff --git a/lib/ansible/modules/cloud/azure/azure_rm_dnsrecordset_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_dnsrecordset_facts.py index 8541aa3c3c4..143577a404b 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_dnsrecordset_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_dnsrecordset_facts.py @@ -73,24 +73,23 @@ azure_dnsrecordset: returned: always type: list example: [ - { - "etag": "60ac0480-44dd-4881-a2ed-680d20b3978e", - "id": "/subscriptions/XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX/resourceGroups/testing/providers/Microsoft.Network/dnszones/newzone.com/A/servera", - "name": "servera", - "properties": { - "ARecords": [ - { - "ipv4Address": "10.4.5.7" - }, - { - "ipv4Address": "2.4.5.8" - } - ], - "TTL": 12900 + { + "etag": "60ac0480-44dd-4881-a2ed-680d20b3978e", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Network/dnszones/newzone.com/A/servera", + "name": "servera", + "properties": { + "ARecords": [ + { + "ipv4Address": "10.4.5.7" }, - "type": "Microsoft.Network/dnszones/A" - } - ] + { + "ipv4Address": "2.4.5.8" + } + ], + "TTL": 12900 + }, + "type": "Microsoft.Network/dnszones/A" + }] dnsrecordsets: description: List of record set dicts, which shares the same hierarchy as azure_rm_dnsrecordset module's parameter. returned: always diff --git a/lib/ansible/modules/cloud/azure/azure_rm_functionapp.py b/lib/ansible/modules/cloud/azure/azure_rm_functionapp.py index e1734414a27..233b8902143 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_functionapp.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_functionapp.py @@ -62,24 +62,25 @@ author: ''' EXAMPLES = ''' -- name: create function app +- name: Create a function app azure_rm_functionapp: resource_group: myResourceGroup - name: myfunctionapp - storage_account: mystorageaccount + name: myFunctionApp + storage_account: myStorageAccount -- name: create a function app with app settings +- name: Create a function app with app settings azure_rm_functionapp: resource_group: myResourceGroup - name: myfunctionapp - storage_account: mystorageaccount + name: myFunctionApp + storage_account: myStorageAccount app_settings: setting1: value1 setting2: value2 -- name: delete a function app +- name: Delete a function app azure_rm_functionapp: - name: myfunctionapp + resource_group: myResourceGroup + name: myFunctionApp state: absent ''' @@ -89,7 +90,7 @@ state: returned: success type: dict example: - id: /subscriptions/.../resourceGroups/ansible-rg/providers/Microsoft.Web/sites/myfunctionapp + id: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Web/sites/myFunctionApp name: myfunctionapp kind: functionapp location: East US @@ -111,7 +112,7 @@ state: - name: myfunctionapp.scm.azurewebsites.net ssl_state: Disabled host_type: Repository - server_farm_id: /subscriptions/.../resourceGroups/ansible-rg/providers/Microsoft.Web/serverfarms/EastUSPlan + server_farm_id: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Web/serverfarms/EastUSPlan reserved: false last_modified_time_utc: 2017-08-22T18:54:01.190Z scm_site_also_stopped: false diff --git a/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py b/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py index 7f04c4065da..0d0295056e0 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_networkinterface.py @@ -246,7 +246,8 @@ EXAMPLES = ''' subnet_name: subnet001 os_type: Windows rdp_port: 3399 - security_group: "/subscriptions/XXXXXXX/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/nsg001" + security_group: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurit + yGroups/nsg001" ip_configurations: - name: ipconfig1 public_ip_address_name: publicip001 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 da72eae6c5c..566ee6c81f5 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/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkInterfaces/nic003", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/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/resourceGroup/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/publicip001", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/publicIPAddresses/publicip001", "name": "publicip001" }, "subnet": { - "id": "/subscriptions/3f7e29ba-24e0-42f6-8d9c-5149a14bda37/resourceGroup/myResourceGroup/providers/Microsoft.Network/virtualNetworks/vnet001/subnets/subnet001", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/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/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/secgroup001", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/secgroup001", "name": "secgroup001" }, "primary": null, 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 efc6661e2bc..1ef05e4b0c0 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/resourceGroup/myResourceGroup/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 d40158ee0ad..e7abea4456c 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/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/AllowVnetInBound", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/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/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/AllowAzureLoadBalancerInBound", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/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/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/DenyAllInBound", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/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/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/AllowVnetOutBound", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/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/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/AllowInternetOutBound", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/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/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/defaultSecurityRules/DenyAllOutBound", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/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/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/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/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/securityRules/DenySSH", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/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/resourceGroup/myResourceGroup/providers/Microsoft.Network/networkSecurityGroups/mysecgroup/securityRules/AllowSSH", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/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_sqldatabase.py b/lib/ansible/modules/cloud/azure/azure_rm_sqldatabase.py index 5e05ecb7eca..d807115b914 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_sqldatabase.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_sqldatabase.py @@ -157,8 +157,8 @@ EXAMPLES = ''' name: restoreddb location: eastus create_mode: restore - restorable_dropped_database_id: "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/s - ervers/testsvr/restorableDroppedDatabases/testdb2,131444841315030000" + restorable_dropped_database_id: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Sql/s + ervers/testsvr/restorableDroppedDatabases/testdb2,131444841315030000" - name: Create SQL Database in Copy Mode azure_rm_sqldatabase: @@ -168,7 +168,7 @@ EXAMPLES = ''' location: eastus create_mode: copy source_database_id: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Sql/servers/tests - vr/databases/testdb" + vr/databases/testdb" ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_storageaccount.py b/lib/ansible/modules/cloud/azure/azure_rm_storageaccount.py index 864254eb912..dc69d6ed324 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/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testing/providers/Microsoft.Storage/storageAccounts/clh0003", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/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 f44948d213a..3c36c33ca4e 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/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testing/providers/Microsoft.Storage/storageAccounts/testaccount001", + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/myResourceGroups/testing/providers/Microsoft.Storage/storageAccounts/testaccount001", "location": "eastus2", "name": "testaccount001", "properties": { diff --git a/lib/ansible/modules/cloud/azure/azure_rm_trafficmanagerendpoint.py b/lib/ansible/modules/cloud/azure/azure_rm_trafficmanagerendpoint.py index ecbbc832a49..1a299304ffd 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_trafficmanagerendpoint.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_trafficmanagerendpoint.py @@ -117,7 +117,8 @@ id: returned: when traffic manager endpoint exists type: str example: - "/subscriptions//resourceGroups/testRg/providers/Microsoft.Network/trafficManagerProfiles/testProfile/externalEndpoints/testendpoint" + "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Network/trafficManagerProfiles/testProfil + e/externalEndpoints/testendpoint" ''' from ansible.module_utils.azure_rm_common import AzureRMModuleBase, normalize_location_name from ansible.module_utils.common.dict_transformations import _snake_to_camel diff --git a/lib/ansible/modules/cloud/azure/azure_rm_trafficmanagerprofile.py b/lib/ansible/modules/cloud/azure/azure_rm_trafficmanagerprofile.py index 8a5069d6575..7b2751a3f3a 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_trafficmanagerprofile.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_trafficmanagerprofile.py @@ -138,14 +138,16 @@ id: description: The ID of the traffic manager profile returned: when traffic manager profile exists type: str - example: "/subscriptions/XXXXXX...XXXXXXXXX/resourceGroups/tmt/providers/Microsoft.Network/trafficManagerProfiles/tmtest" + example: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/tmt/providers/Microsoft.Network/trafficManagerProfiles/tmtest" endpoints: description: List of endpoint IDs attached to the profile returned: when traffic manager endpoints exists type: list sample: [ - "/subscriptions/XXXXXX...XXXXXXXXX/resourceGroups/tmt/providers/Microsoft.Network/trafficManagerProfiles/tm049b1ae293/externalEndpoints/e2", - "/subscriptions/XXXXXX...XXXXXXXXX/resourceGroups/tmt/providers/Microsoft.Network/trafficManagerProfiles/tm049b1ae293/externalEndpoints/e1" + "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/tmt/providers/Microsoft.Network/trafficManagerProfiles/tm049b1ae293/exter + nalEndpoints/e2", + "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/tmt/providers/Microsoft.Network/trafficManagerProfiles/tm049b1ae293/exter + nalEndpoints/e1" ] ''' from ansible.module_utils.azure_rm_common import AzureRMModuleBase, normalize_location_name diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualnetworkpeering.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualnetworkpeering.py index 651508cea2e..7b514641425 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualnetworkpeering.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualnetworkpeering.py @@ -81,19 +81,19 @@ EXAMPLES = ''' - name: Create virtual network peering azure_rm_virtualnetworkpeering: resource_group: myResourceGroup - name: vnet_peer1 - virtual_network: myVnet1 + virtual_network: myVirtualNetwork + name: myPeering remote_virtual_network: resource_group: mySecondResourceGroup - name: myVnet2 + name: myRemoteVirtualNetwork allow_virtual_network_access: false allow_forwarded_traffic: true - name: Delete the virtual network peering azure_rm_virtualnetworkpeering: resource_group: myResourceGroup - name: vnet_peer1 - virtual_network: myVnet1 + virtual_network: myVirtualNetwork + name: myPeering state: absent ''' RETURN = ''' @@ -102,7 +102,8 @@ id: returned: always type: dict example: - id: /subscriptions/xxxx/resourceGroups/xxxx/providers/Microsoft.Network/virtualNetworks/xxxx/virtualNetworkPeerings/peer1 + id: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualN + etwork/virtualNetworkPeerings/myPeering" ''' try: diff --git a/lib/ansible/modules/cloud/azure/azure_rm_webapp.py b/lib/ansible/modules/cloud/azure/azure_rm_webapp.py index 13288426289..24130d6ae96 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_webapp.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_webapp.py @@ -277,7 +277,7 @@ azure_webapp: returned: always type: dict sample: { - "id": "/subscriptions//resourceGroups/ansiblewebapp1/providers/Microsoft.Web/sites/ansiblewindowsaaa" + "id": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Web/sites/ansiblewindowsaaa" } '''