diff --git a/lib/ansible/modules/cloud/azure/azure_rm_applicationsecuritygroup_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_applicationsecuritygroup_info.py similarity index 97% rename from lib/ansible/modules/cloud/azure/azure_rm_applicationsecuritygroup_facts.py rename to lib/ansible/modules/cloud/azure/azure_rm_applicationsecuritygroup_info.py index 777b0c0bc83..1c9b4d3bd9d 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_applicationsecuritygroup_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_applicationsecuritygroup_info.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_applicationsecuritygroup_facts +module: azure_rm_applicationsecuritygroup_info version_added: "2.8" short_description: Get Azure Application Security Group facts. description: @@ -42,14 +42,14 @@ author: EXAMPLES = ''' - name: List application security groups in specific resource group - azure_rm_applicationsecuritygroup_facts: + azure_rm_applicationsecuritygroup_info: resource_group: myResourceGroup - name: List application security groups in specific subscription - azure_rm_applicationsecuritygroup_facts: + azure_rm_applicationsecuritygroup_info: - name: Get application security group by name - azure_rm_applicationsecuritygroup_facts: + azure_rm_applicationsecuritygroup_info: resource_group: myResourceGroup name: myApplicationSecurityGroup tags: diff --git a/lib/ansible/modules/cloud/azure/azure_rm_cdnendpoint_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_cdnendpoint_info.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_cdnendpoint_facts.py rename to lib/ansible/modules/cloud/azure/azure_rm_cdnendpoint_info.py index a351ba8c6fe..67df4787ba8 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_cdnendpoint_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_cdnendpoint_info.py @@ -14,7 +14,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_cdnendpoint_facts +module: azure_rm_cdnendpoint_info version_added: "2.8" @@ -49,12 +49,12 @@ author: EXAMPLES = ''' - name: Get facts for all endpoints in CDN profile - azure_rm_cdnendpoint_facts: + azure_rm_cdnendpoint_info: resource_group: myResourceGroup profile_name: myCDNProfile - name: Get facts of specific CDN endpoint - azure_rm_cdnendpoint_facts: + azure_rm_cdnendpoint_info: resource_group: myResourceGroup profile_name: myCDNProfile name: myEndpoint1 diff --git a/lib/ansible/modules/cloud/azure/azure_rm_cdnprofile_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_cdnprofile_info.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_cdnprofile_facts.py rename to lib/ansible/modules/cloud/azure/azure_rm_cdnprofile_info.py index f4566df0138..a62fd237b46 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_cdnprofile_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_cdnprofile_info.py @@ -14,7 +14,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_cdnprofile_facts +module: azure_rm_cdnprofile_info version_added: "2.8" @@ -44,15 +44,15 @@ author: EXAMPLES = ''' - name: Get facts for one CDN profile - azure_rm_cdnprofile_facts: + azure_rm_cdnprofile_info: name: Testing resource_group: myResourceGroup - name: Get facts for all CDN profiles - azure_rm_cdnprofile_facts: + azure_rm_cdnprofile_info: - name: Get facts by tags - azure_rm_cdnprofile_facts: + azure_rm_cdnprofile_info: tags: - Environment:Test ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_containerinstance_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_containerinstance_info.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_containerinstance_facts.py rename to lib/ansible/modules/cloud/azure/azure_rm_containerinstance_info.py index 369df2fcb36..b917d7085d6 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_containerinstance_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_containerinstance_info.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_containerinstance_facts +module: azure_rm_containerinstance_info version_added: "2.8" short_description: Get Azure Container Instance facts. description: @@ -43,12 +43,12 @@ author: EXAMPLES = ''' - name: Get specific Container Instance facts - azure_rm_containerinstance_facts: + azure_rm_containerinstance_info: resource_group: myResourceGroup name: container_group_name - name: List Container Instances in a specified resource group name - azure_rm_containerinstance_facts: + azure_rm_containerinstance_info: resource_group: myResourceGroup ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount_info.py similarity index 99% rename from lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount_facts.py rename to lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount_info.py index bb43c856ed8..fa51bba4fd0 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount_info.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_cosmosdbaccount_facts +module: azure_rm_cosmosdbaccount_info version_added: "2.8" short_description: Get Azure Cosmos DB Account facts. description: @@ -53,7 +53,7 @@ author: EXAMPLES = ''' - name: Get instance of Database Account - azure_rm_cosmosdbaccount_facts: + azure_rm_cosmosdbaccount_info: resource_group: myResourceGroup name: testaccount diff --git a/lib/ansible/modules/cloud/azure/azure_rm_deployment_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_deployment_info.py similarity index 99% rename from lib/ansible/modules/cloud/azure/azure_rm_deployment_facts.py rename to lib/ansible/modules/cloud/azure/azure_rm_deployment_info.py index 912f5b6097f..c8f5c1d809b 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_deployment_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_deployment_info.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_deployment_facts +module: azure_rm_deployment_info version_added: "2.8" short_description: Get Azure Deployment facts. description: @@ -40,7 +40,7 @@ author: EXAMPLES = ''' - name: Get instance of Deployment - azure_rm_deployment_facts: + azure_rm_deployment_info: resource_group: myResourceGroup name: myDeployment ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_image_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_image_info.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_image_facts.py rename to lib/ansible/modules/cloud/azure/azure_rm_image_info.py index 9911bef9325..10faa6b2e8c 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_image_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_image_info.py @@ -12,7 +12,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_image_facts +module: azure_rm_image_info version_added: "2.8" @@ -42,19 +42,19 @@ author: EXAMPLES = ''' - name: List images with name - azure_rm_image_facts: + azure_rm_image_info: name: test-image resource_group: myResourceGroup - name: List images by resource group - azure_rm_image_facts: + azure_rm_image_info: resource_group: myResourceGroup tags: - testing - foo:bar - name: List all available images under current subscription - azure_rm_image_facts: + azure_rm_image_info: ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_rediscache_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_rediscache_info.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_rediscache_facts.py rename to lib/ansible/modules/cloud/azure/azure_rm_rediscache_info.py index c16e16e75aa..d6a95a13627 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_rediscache_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_rediscache_info.py @@ -14,7 +14,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_rediscache_facts +module: azure_rm_rediscache_info version_added: "2.8" @@ -49,18 +49,18 @@ author: EXAMPLES = ''' - name: Get Redis Cache by name - azure_rm_rediscache_facts: + azure_rm_rediscache_info: resource_group: myResourceGroup name: myRedis - name: Get Redis Cache with access keys by name - azure_rm_rediscache_facts: + azure_rm_rediscache_info: resource_group: myResourceGroup name: myRedis return_access_keys: true - name: Get Redis Cache in specific resource group - azure_rm_rediscache_facts: + azure_rm_rediscache_info: resource_group: myResourceGroup ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_roleassignment_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_roleassignment_info.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_roleassignment_facts.py rename to lib/ansible/modules/cloud/azure/azure_rm_roleassignment_info.py index 19999edbf83..a1bf0fe6c88 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_roleassignment_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_roleassignment_info.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_roleassignment_facts +module: azure_rm_roleassignment_info version_added: "2.8" short_description: Gets Azure Role Assignment facts. description: @@ -47,11 +47,11 @@ author: EXAMPLES = ''' - name: Get role assignments for specific service principal - azure_rm_roleassignment_facts: + azure_rm_roleassignment_info: assignee: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx - name: Get role assignments for specific scope - azure_rm_roleassignment_facts: + azure_rm_roleassignment_info: scope: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_roledefinition_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_roledefinition_info.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_roledefinition_facts.py rename to lib/ansible/modules/cloud/azure/azure_rm_roledefinition_info.py index c83dff03865..a757a660c15 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_roledefinition_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_roledefinition_info.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_roledefinition_facts +module: azure_rm_roledefinition_info version_added: "2.8" short_description: Get Azure Role Definition facts. description: @@ -47,11 +47,11 @@ author: EXAMPLES = ''' - name: List Role Definitions in scope - azure_rm_roledefinition_facts: + azure_rm_roledefinition_info: scope: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup - name: Get Role Definition by name - azure_rm_roledefinition_facts: + azure_rm_roledefinition_info: scope: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup name: myRoleDefinition ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_subnet_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_subnet_info.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_subnet_facts.py rename to lib/ansible/modules/cloud/azure/azure_rm_subnet_info.py index 30927847c18..c4a737aed97 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_subnet_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_subnet_info.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_subnet_facts +module: azure_rm_subnet_info version_added: "2.8" short_description: Get Azure Subnet facts. description: @@ -44,13 +44,13 @@ author: EXAMPLES = ''' - name: Get facts of specific subnet - azure_rm_subnet_facts: + azure_rm_subnet_info: resource_group: myResourceGroup virtual_network_name: myVirtualNetwork name: mySubnet - name: List facts for all subnets in virtual network - azure_rm_subnet_facts: + azure_rm_subnet_info: resource_group: myResourceGroup virtual_network_name: myVirtualNetwork name: mySubnet diff --git a/test/integration/targets/azure_rm_cdnprofile/tasks/main.yml b/test/integration/targets/azure_rm_cdnprofile/tasks/main.yml index 69550d9e2df..657881a5070 100644 --- a/test/integration/targets/azure_rm_cdnprofile/tasks/main.yml +++ b/test/integration/targets/azure_rm_cdnprofile/tasks/main.yml @@ -17,7 +17,7 @@ check_mode: yes - name: Check there is no CDN profile created - azure_rm_cdnprofile_facts: + azure_rm_cdnprofile_info: resource_group: "{{ resource_group }}" name: "{{ cdnprofilename }}" register: fact @@ -43,7 +43,7 @@ - output.id != '' - name: Gather CDN profile facts - azure_rm_cdnprofile_facts: + azure_rm_cdnprofile_info: resource_group: "{{ resource_group }}" name: "{{ cdnprofilename }}" register: fact @@ -96,7 +96,7 @@ check_mode: yes - name: Gather CDN profile facts - azure_rm_cdnprofile_facts: + azure_rm_cdnprofile_info: resource_group: "{{ resource_group }}" name: "{{ cdnprofilename }}" register: fact @@ -144,7 +144,7 @@ - output.id - name: Get facts of a Azure CDN endpoint - azure_rm_cdnendpoint_facts: + azure_rm_cdnendpoint_info: resource_group: "{{ resource_group }}" name: "{{ endpointname }}" profile_name: "{{ cdnprofilename }}" @@ -265,7 +265,7 @@ - output.changed - name: Get CDN profile fact - azure_rm_cdnprofile_facts: + azure_rm_cdnprofile_info: resource_group: "{{ resource_group }}" name: "{{ cdnprofilename }}" register: fact diff --git a/test/integration/targets/azure_rm_containerinstance/tasks/main.yml b/test/integration/targets/azure_rm_containerinstance/tasks/main.yml index 13ce1a7a7bd..a76e387a30b 100644 --- a/test/integration/targets/azure_rm_containerinstance/tasks/main.yml +++ b/test/integration/targets/azure_rm_containerinstance/tasks/main.yml @@ -100,7 +100,7 @@ register: output - name: Gather facts for single Container Instance - azure_rm_containerinstance_facts: + azure_rm_containerinstance_info: resource_group: "{{ resource_group }}" name: "aci{{ resource_group | hash('md5') | truncate(7, True, '') }}sec" register: output @@ -124,7 +124,7 @@ - output.containerinstances[0]['restart_policy'] == 'on_failure' - name: Gather facts for all Container Instances in the resource group - azure_rm_containerinstance_facts: + azure_rm_containerinstance_info: resource_group: "{{ resource_group }}" register: output diff --git a/test/integration/targets/azure_rm_cosmosdbaccount/tasks/main.yml b/test/integration/targets/azure_rm_cosmosdbaccount/tasks/main.yml index cebf4e80fd1..f50aa47c55f 100644 --- a/test/integration/targets/azure_rm_cosmosdbaccount/tasks/main.yml +++ b/test/integration/targets/azure_rm_cosmosdbaccount/tasks/main.yml @@ -116,7 +116,7 @@ - output.changed - name: Get facts of single account - azure_rm_cosmosdbaccount_facts: + azure_rm_cosmosdbaccount_info: resource_group: "{{ resource_group }}" name: "{{ dbname }}" register: output @@ -148,7 +148,7 @@ - output.accounts[0]['tags'] != None - name: Get facts with keys - azure_rm_cosmosdbaccount_facts: + azure_rm_cosmosdbaccount_info: resource_group: "{{ resource_group }}" name: "{{ dbname }}" retrieve_keys: all @@ -164,7 +164,7 @@ - output.accounts[0]['secondary_readonly_master_key'] != None - name: Get facts with readonly keys - azure_rm_cosmosdbaccount_facts: + azure_rm_cosmosdbaccount_info: resource_group: "{{ resource_group }}" name: "{{ dbname }}" retrieve_keys: readonly @@ -182,7 +182,7 @@ - output.accounts[0]['connection_strings'] | length > 0 - name: List acounts by resource group - azure_rm_cosmosdbaccount_facts: + azure_rm_cosmosdbaccount_info: resource_group: "{{ resource_group }}" name: "{{ dbname }}" register: output diff --git a/test/integration/targets/azure_rm_deployment/tasks/main.yml b/test/integration/targets/azure_rm_deployment/tasks/main.yml index e24b1472f0d..fb3d1951512 100644 --- a/test/integration/targets/azure_rm_deployment/tasks/main.yml +++ b/test/integration/targets/azure_rm_deployment/tasks/main.yml @@ -29,7 +29,7 @@ with_items: "{{ output.deployment.instances }}" - name: Get Deployment Facts - azure_rm_deployment_facts: + azure_rm_deployment_info: resource_group: "{{ resource_group }}" name: "{{ dns_label }}" register: output diff --git a/test/integration/targets/azure_rm_image/tasks/main.yml b/test/integration/targets/azure_rm_image/tasks/main.yml index 7a7bc7095f7..2ff96e7beae 100644 --- a/test/integration/targets/azure_rm_image/tasks/main.yml +++ b/test/integration/targets/azure_rm_image/tasks/main.yml @@ -106,7 +106,7 @@ - output.id - name: Gather information about image created - azure_rm_image_facts: + azure_rm_image_info: resource_group: "{{ resource_group }}" name: testimage001 register: output diff --git a/test/integration/targets/azure_rm_networkinterface/tasks/main.yml b/test/integration/targets/azure_rm_networkinterface/tasks/main.yml index 2dbb338b1cf..716c6bebf05 100644 --- a/test/integration/targets/azure_rm_networkinterface/tasks/main.yml +++ b/test/integration/targets/azure_rm_networkinterface/tasks/main.yml @@ -351,7 +351,7 @@ - output.id != '' - name: Get Application security group - azure_rm_applicationsecuritygroup_facts: + azure_rm_applicationsecuritygroup_info: resource_group: "{{ resource_group }}" name: "{{ applicationsecuritygroup_name1 }}" register: facts diff --git a/test/integration/targets/azure_rm_rediscache/tasks/main.yml b/test/integration/targets/azure_rm_rediscache/tasks/main.yml index 5081a173334..66b6a0dfb9d 100644 --- a/test/integration/targets/azure_rm_rediscache/tasks/main.yml +++ b/test/integration/targets/azure_rm_rediscache/tasks/main.yml @@ -36,7 +36,7 @@ - output.id - name: Get facts - azure_rm_rediscache_facts: + azure_rm_rediscache_info: resource_group: "{{ resource_group }}" name: "{{ redis_name }}" register: facts @@ -177,7 +177,7 @@ - output.id - name: Get facts - azure_rm_rediscache_facts: + azure_rm_rediscache_info: resource_group: "{{ resource_group }}" name: "{{ redis_name }}2" return_access_keys: True diff --git a/test/integration/targets/azure_rm_roledefinition/tasks/main.yml b/test/integration/targets/azure_rm_roledefinition/tasks/main.yml index d44586500e0..03ed2e064d9 100644 --- a/test/integration/targets/azure_rm_roledefinition/tasks/main.yml +++ b/test/integration/targets/azure_rm_roledefinition/tasks/main.yml @@ -51,7 +51,7 @@ - output.changed - name: Get facts by name - azure_rm_roledefinition_facts: + azure_rm_roledefinition_info: scope: "/subscriptions/{{ subscription_id }}/resourceGroups/{{ resource_group }}" type: custom register: facts @@ -61,7 +61,7 @@ - facts['roledefinitions'] | length > 1 - name: Get facts - azure_rm_roledefinition_facts: + azure_rm_roledefinition_info: scope: "/subscriptions/{{ subscription_id }}/resourceGroups/{{ resource_group }}" role_name: "{{ role_name }}" register: facts @@ -119,7 +119,7 @@ - output.changed - name: Get role definition facts - azure_rm_roledefinition_facts: + azure_rm_roledefinition_info: role_name: "{{ role_name }}" scope: "/subscriptions/{{ subscription_id }}/resourceGroups/{{ resource_group }}" type: custom @@ -157,7 +157,7 @@ - output.changed - name: Get facts - azure_rm_roleassignment_facts: + azure_rm_roleassignment_info: scope: "/subscriptions/{{ subscription_id }}/resourceGroups/{{ resource_group }}" assignee: "{{ principal_id }}" register: facts diff --git a/test/integration/targets/azure_rm_subnet/tasks/main.yml b/test/integration/targets/azure_rm_subnet/tasks/main.yml index 1d8d71d5673..1475b961f78 100644 --- a/test/integration/targets/azure_rm_subnet/tasks/main.yml +++ b/test/integration/targets/azure_rm_subnet/tasks/main.yml @@ -142,7 +142,7 @@ that: not output.changed - name: Get subnet facts - azure_rm_subnet_facts: + azure_rm_subnet_info: name: foobar virtual_network_name: My_Virtual_Network resource_group: "{{ resource_group }}"