From 8051bef12e249bf5b6e1418afe939b196c27926d Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Fri, 29 Mar 2019 19:13:51 +0800 Subject: [PATCH] doc fixes in resorce group (#54575) * doc fixes in resorce group * ltl fix --- .../modules/cloud/azure/azure_rm_resourcegroup.py | 10 ++++++++-- .../cloud/azure/azure_rm_resourcegroup_facts.py | 15 ++++++++------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup.py b/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup.py index 04e56fbc02..b742e543c6 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup.py @@ -60,7 +60,7 @@ author: EXAMPLES = ''' - name: Create a resource group azure_rm_resourcegroup: - name: Testing + name: myResourceGroup location: westus tags: testing: testing @@ -68,7 +68,13 @@ EXAMPLES = ''' - name: Delete a resource group azure_rm_resourcegroup: - name: Testing + name: myResourceGroup + state: absent + + - name: Delete a resource group including resources it contains + azure_rm_resourcegroup: + name: myResourceGroup + force_delete_nonempty: yes state: absent ''' RETURN = ''' 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 c3fe63012a..73bfa25f16 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_resourcegroup_facts.py @@ -50,7 +50,7 @@ author: EXAMPLES = ''' - name: Get facts for one resource group azure_rm_resourcegroup_facts: - name: Testing + name: myResourceGroup - name: Get facts for all resource groups azure_rm_resourcegroup_facts: @@ -61,9 +61,9 @@ EXAMPLES = ''' - testing - foo:bar - - name: List resources under resource group + - name: Get facts for one resource group including resources it contains azure_rm_resourcegroup_facts: - name: foo + name: myResourceGroup list_resources: yes ''' RETURN = ''' @@ -76,7 +76,7 @@ azure_resourcegroups: description: - Resource id. type: str - sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/foo" + sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroup/myResourceGroup" name: description: - Resource group name. @@ -84,7 +84,7 @@ azure_resourcegroups: sample: foo tags: description: - - Tags to assign to the managed disk. + - Tags assigned to resource group. type: dict sample: { "tag": "value" } resources: @@ -97,12 +97,13 @@ azure_resourcegroups: description: - Resource id. type: str - sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/foo/providers/Microsoft.XX/XXX/bar" + sample: "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.Compute/virtualMa + chines/myVirtualMachine" name: description: - Resource name. type: str - sample: bar + sample: myVirtualMachine location: description: - Resource region.