diff --git a/lib/ansible/modules/cloud/azure/azure_rm_applicationsecuritygroup_info.py b/lib/ansible/modules/cloud/azure/azure_rm_applicationsecuritygroup_facts.py similarity index 97% rename from lib/ansible/modules/cloud/azure/azure_rm_applicationsecuritygroup_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_applicationsecuritygroup_facts.py index 1c9b4d3bd9d..777b0c0bc83 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_applicationsecuritygroup_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_applicationsecuritygroup_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_applicationsecuritygroup_info +module: azure_rm_applicationsecuritygroup_facts 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_info: + azure_rm_applicationsecuritygroup_facts: resource_group: myResourceGroup - name: List application security groups in specific subscription - azure_rm_applicationsecuritygroup_info: + azure_rm_applicationsecuritygroup_facts: - name: Get application security group by name - azure_rm_applicationsecuritygroup_info: + azure_rm_applicationsecuritygroup_facts: resource_group: myResourceGroup name: myApplicationSecurityGroup tags: diff --git a/lib/ansible/modules/cloud/azure/azure_rm_appserviceplan_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_appserviceplan_facts.py index 21c30686602..b5f198f317e 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_appserviceplan_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_appserviceplan_facts.py @@ -211,19 +211,19 @@ class AzureRMAppServicePlanFacts(AzureRMModuleBase): return results def construct_curated_plan(self, plan): - plan_info = self.serialize_obj(plan, AZURE_OBJECT_CLASS) + plan_facts = self.serialize_obj(plan, AZURE_OBJECT_CLASS) curated_output = dict() - curated_output['id'] = plan_info['id'] - curated_output['name'] = plan_info['name'] - curated_output['resource_group'] = plan_info['properties']['resourceGroup'] - curated_output['location'] = plan_info['location'] - curated_output['tags'] = plan_info.get('tags', None) + curated_output['id'] = plan_facts['id'] + curated_output['name'] = plan_facts['name'] + curated_output['resource_group'] = plan_facts['properties']['resourceGroup'] + curated_output['location'] = plan_facts['location'] + curated_output['tags'] = plan_facts.get('tags', None) curated_output['is_linux'] = False - curated_output['kind'] = plan_info['kind'] - curated_output['sku'] = plan_info['sku'] + curated_output['kind'] = plan_facts['kind'] + curated_output['sku'] = plan_facts['sku'] - if plan_info['properties'].get('reserved', None): + if plan_facts['properties'].get('reserved', None): curated_output['is_linux'] = True return curated_output diff --git a/lib/ansible/modules/cloud/azure/azure_rm_cdnendpoint_info.py b/lib/ansible/modules/cloud/azure/azure_rm_cdnendpoint_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_cdnendpoint_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_cdnendpoint_facts.py index 67df4787ba8..a351ba8c6fe 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_cdnendpoint_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_cdnendpoint_facts.py @@ -14,7 +14,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_cdnendpoint_info +module: azure_rm_cdnendpoint_facts version_added: "2.8" @@ -49,12 +49,12 @@ author: EXAMPLES = ''' - name: Get facts for all endpoints in CDN profile - azure_rm_cdnendpoint_info: + azure_rm_cdnendpoint_facts: resource_group: myResourceGroup profile_name: myCDNProfile - name: Get facts of specific CDN endpoint - azure_rm_cdnendpoint_info: + azure_rm_cdnendpoint_facts: resource_group: myResourceGroup profile_name: myCDNProfile name: myEndpoint1 diff --git a/lib/ansible/modules/cloud/azure/azure_rm_cdnprofile_info.py b/lib/ansible/modules/cloud/azure/azure_rm_cdnprofile_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_cdnprofile_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_cdnprofile_facts.py index a62fd237b46..f4566df0138 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_cdnprofile_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_cdnprofile_facts.py @@ -14,7 +14,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_cdnprofile_info +module: azure_rm_cdnprofile_facts version_added: "2.8" @@ -44,15 +44,15 @@ author: EXAMPLES = ''' - name: Get facts for one CDN profile - azure_rm_cdnprofile_info: + azure_rm_cdnprofile_facts: name: Testing resource_group: myResourceGroup - name: Get facts for all CDN profiles - azure_rm_cdnprofile_info: + azure_rm_cdnprofile_facts: - name: Get facts by tags - azure_rm_cdnprofile_info: + azure_rm_cdnprofile_facts: tags: - Environment:Test ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_containerinstance_info.py b/lib/ansible/modules/cloud/azure/azure_rm_containerinstance_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_containerinstance_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_containerinstance_facts.py index 73024ca646f..ac9c39a3391 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_containerinstance_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_containerinstance_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_containerinstance_info +module: azure_rm_containerinstance_facts 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_info: + azure_rm_containerinstance_facts: resource_group: myResourceGroup name: container_group_name - name: List Container Instances in a specified resource group name - azure_rm_containerinstance_info: + azure_rm_containerinstance_facts: resource_group: myResourceGroup ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount_info.py b/lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount_facts.py similarity index 99% rename from lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount_facts.py index fa51bba4fd0..bb43c856ed8 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_cosmosdbaccount_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_cosmosdbaccount_info +module: azure_rm_cosmosdbaccount_facts 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_info: + azure_rm_cosmosdbaccount_facts: resource_group: myResourceGroup name: testaccount diff --git a/lib/ansible/modules/cloud/azure/azure_rm_deployment_info.py b/lib/ansible/modules/cloud/azure/azure_rm_deployment_facts.py similarity index 99% rename from lib/ansible/modules/cloud/azure/azure_rm_deployment_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_deployment_facts.py index c8f5c1d809b..912f5b6097f 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_deployment_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_deployment_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_deployment_info +module: azure_rm_deployment_facts 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_info: + azure_rm_deployment_facts: resource_group: myResourceGroup name: myDeployment ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_devtestlab_info.py b/lib/ansible/modules/cloud/azure/azure_rm_devtestlab_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_devtestlab_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_devtestlab_facts.py index 8cd07ea4b1f..a19f1da18e9 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_devtestlab_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_devtestlab_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_devtestlab_info +module: azure_rm_devtestlab_facts version_added: "2.8" short_description: Get Azure DevTest Lab facts. description: @@ -41,14 +41,14 @@ author: EXAMPLES = ''' - name: List instances of DevTest Lab by resource group - azure_rm_devtestlab_info: + azure_rm_devtestlab_facts: resource_group: testrg - name: List instances of DevTest Lab in subscription - azure_rm_devtestlab_info: + azure_rm_devtestlab_facts: - name: Get instance of DevTest Lab - azure_rm_devtestlab_info: + azure_rm_devtestlab_facts: resource_group: testrg name: testlab ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_devtestlabarmtemplate_info.py b/lib/ansible/modules/cloud/azure/azure_rm_devtestlabarmtemplate_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_devtestlabarmtemplate_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_devtestlabarmtemplate_facts.py index e98ea5da8d2..81698ccdd32 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_devtestlabarmtemplate_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_devtestlabarmtemplate_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_devtestlabarmtemplate_info +module: azure_rm_devtestlabarmtemplate_facts version_added: "2.8" short_description: Get Azure DevTest Lab ARM Template facts. description: @@ -48,7 +48,7 @@ author: EXAMPLES = ''' - name: Get information on DevTest Lab ARM Template - azure_rm_devtestlabarmtemplate_info: + azure_rm_devtestlabarmtemplate_facts: resource_group: myResourceGroup lab_name: myLab artifact_source_name: public environment repo diff --git a/lib/ansible/modules/cloud/azure/azure_rm_devtestlabartifact_info.py b/lib/ansible/modules/cloud/azure/azure_rm_devtestlabartifact_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_devtestlabartifact_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_devtestlabartifact_facts.py index 64c54a93e2d..f28dcbaea41 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_devtestlabartifact_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_devtestlabartifact_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_devtestlabartifact_info +module: azure_rm_devtestlabartifact_facts version_added: "2.8" short_description: Get Azure DevTest Lab Artifact facts. description: @@ -48,7 +48,7 @@ author: EXAMPLES = ''' - name: Get instance of DevTest Lab Artifact - azure_rm_devtestlabartifact_info: + azure_rm_devtestlabartifact_facts: resource_group: myResourceGroup lab_name: myLab artifact_source_name: myArtifactSource diff --git a/lib/ansible/modules/cloud/azure/azure_rm_devtestlabartifactsource_info.py b/lib/ansible/modules/cloud/azure/azure_rm_devtestlabartifactsource_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_devtestlabartifactsource_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_devtestlabartifactsource_facts.py index 0f46c948bb3..5fad2de3f62 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_devtestlabartifactsource_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_devtestlabartifactsource_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_devtestlabartifactsource_info +module: azure_rm_devtestlabartifactsource_facts version_added: "2.8" short_description: Get Azure DevTest Lab Artifact Source facts. description: @@ -47,7 +47,7 @@ author: EXAMPLES = ''' - name: Get instance of DevTest Lab Artifact Source - azure_rm_devtestlabartifactsource_info: + azure_rm_devtestlabartifactsource_facts: resource_group: myResourceGroup lab_name: myLab name: myArtifactSource diff --git a/lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualmachine_info.py b/lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualmachine_facts.py similarity index 99% rename from lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualmachine_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualmachine_facts.py index 21a7af2baa0..450ff459f66 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualmachine_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualmachine_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_devtestlabvirtualmachine_info +module: azure_rm_devtestlabvirtualmachine_facts version_added: "2.8" short_description: Get Azure DevTest Lab Virtual Machine facts. description: @@ -47,7 +47,7 @@ author: EXAMPLES = ''' - name: Get instance of DTL Virtual Machine - azure_rm_devtestlabvirtualmachine_info: + azure_rm_devtestlabvirtualmachine_facts: resource_group: myResourceGroup lab_name: myLab name: myVm diff --git a/lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualnetwork_info.py b/lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualnetwork_facts.py similarity index 97% rename from lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualnetwork_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualnetwork_facts.py index d0f03205a22..2a630f0280c 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualnetwork_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_devtestlabvirtualnetwork_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_devtestlabvirtualnetwork_info +module: azure_rm_devtestlabvirtualnetwork_facts version_added: "2.8" short_description: Get Azure DevTest Lab Virtual Network facts. description: @@ -44,13 +44,13 @@ author: EXAMPLES = ''' - name: Get instance of DevTest Lab Virtual Network - azure_rm_devtestlabvirtualnetwork_info: + azure_rm_devtestlabvirtualnetwork_facts: resource_group: myResourceGroup lab_name: myLab name: myVirtualNetwork - name: List all Virtual Networks in DevTest Lab - azure_rm_devtestlabvirtualnetwork_info: + azure_rm_devtestlabvirtualnetwork_facts: resource_group: myResourceGroup lab_name: myLab name: myVirtualNetwork diff --git a/lib/ansible/modules/cloud/azure/azure_rm_image_info.py b/lib/ansible/modules/cloud/azure/azure_rm_image_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_image_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_image_facts.py index 10faa6b2e8c..9911bef9325 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_image_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_image_facts.py @@ -12,7 +12,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_image_info +module: azure_rm_image_facts version_added: "2.8" @@ -42,19 +42,19 @@ author: EXAMPLES = ''' - name: List images with name - azure_rm_image_info: + azure_rm_image_facts: name: test-image resource_group: myResourceGroup - name: List images by resource group - azure_rm_image_info: + azure_rm_image_facts: resource_group: myResourceGroup tags: - testing - foo:bar - name: List all available images under current subscription - azure_rm_image_info: + azure_rm_image_facts: ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_mariadbconfiguration_info.py b/lib/ansible/modules/cloud/azure/azure_rm_mariadbconfiguration_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_mariadbconfiguration_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_mariadbconfiguration_facts.py index 9bb657325e4..fd49a964c02 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_mariadbconfiguration_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_mariadbconfiguration_facts.py @@ -16,7 +16,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_mariadbconfiguration_info +module: azure_rm_mariadbconfiguration_facts version_added: "2.8" short_description: Get Azure MariaDB Configuration facts. description: @@ -46,13 +46,13 @@ author: EXAMPLES = ''' - name: Get specific setting of MariaDB Server - azure_rm_mariadbconfiguration_info: + azure_rm_mariadbconfiguration_facts: resource_group: myResourceGroup server_name: testserver name: deadlock_timeout - name: Get all settings of MariaDB Server - azure_rm_mariadbconfiguration_info: + azure_rm_mariadbconfiguration_facts: resource_group: myResourceGroup server_name: server_name ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_mariadbdatabase_info.py b/lib/ansible/modules/cloud/azure/azure_rm_mariadbdatabase_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_mariadbdatabase_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_mariadbdatabase_facts.py index dd9864b3838..7a66e68e97f 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_mariadbdatabase_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_mariadbdatabase_facts.py @@ -16,7 +16,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_mariadbdatabase_info +module: azure_rm_mariadbdatabase_facts version_added: "2.8" short_description: Get Azure MariaDB Database facts. description: @@ -46,13 +46,13 @@ author: EXAMPLES = ''' - name: Get instance of MariaDB Database - azure_rm_mariadbdatabase_info: + azure_rm_mariadbdatabase_facts: resource_group: myResourceGroup server_name: server_name name: database_name - name: List instances of MariaDB Database - azure_rm_mariadbdatabase_info: + azure_rm_mariadbdatabase_facts: resource_group: myResourceGroup server_name: server_name ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_mariadbfirewallrule_info.py b/lib/ansible/modules/cloud/azure/azure_rm_mariadbfirewallrule_facts.py similarity index 97% rename from lib/ansible/modules/cloud/azure/azure_rm_mariadbfirewallrule_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_mariadbfirewallrule_facts.py index d7c0d8fb982..f4464179ced 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_mariadbfirewallrule_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_mariadbfirewallrule_facts.py @@ -16,7 +16,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_mariadbfirewallrule_info +module: azure_rm_mariadbfirewallrule_facts version_added: "2.8" short_description: Get Azure MariaDB Firewall Rule facts. description: @@ -46,13 +46,13 @@ author: EXAMPLES = ''' - name: Get instance of MariaDB Firewall Rule - azure_rm_mariadbfirewallrule_info: + azure_rm_mariadbfirewallrule_facts: resource_group: myResourceGroup server_name: server_name name: firewall_rule_name - name: List instances of MariaDB Firewall Rule - azure_rm_mariadbfirewallrule_info: + azure_rm_mariadbfirewallrule_facts: resource_group: myResourceGroup server_name: server_name ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_mariadbserver_info.py b/lib/ansible/modules/cloud/azure/azure_rm_mariadbserver_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_mariadbserver_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_mariadbserver_facts.py index 7c9d26b321b..81a451872d8 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_mariadbserver_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_mariadbserver_facts.py @@ -16,7 +16,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_mariadbserver_info +module: azure_rm_mariadbserver_facts version_added: "2.8" short_description: Get Azure MariaDB Server facts. description: @@ -45,12 +45,12 @@ author: EXAMPLES = ''' - name: Get instance of MariaDB Server - azure_rm_mariadbserver_info: + azure_rm_mariadbserver_facts: resource_group: myResourceGroup name: server_name - name: List instances of MariaDB Server - azure_rm_mariadbserver_info: + azure_rm_mariadbserver_facts: resource_group: myResourceGroup ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_mysqlconfiguration_info.py b/lib/ansible/modules/cloud/azure/azure_rm_mysqlconfiguration_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_mysqlconfiguration_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_mysqlconfiguration_facts.py index 55e6fa43c72..772f07dd4e7 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_mysqlconfiguration_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_mysqlconfiguration_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_mysqlconfiguration_info +module: azure_rm_mysqlconfiguration_facts version_added: "2.8" short_description: Get Azure MySQL Configuration facts. description: @@ -44,13 +44,13 @@ author: EXAMPLES = ''' - name: Get specific setting of MySQL Server - azure_rm_mysqlconfiguration_info: + azure_rm_mysqlconfiguration_facts: resource_group: myResourceGroup server_name: testmysqlserver name: deadlock_timeout - name: Get all settings of MySQL Server - azure_rm_mysqlconfiguration_info: + azure_rm_mysqlconfiguration_facts: resource_group: myResourceGroup server_name: server_name ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_mysqlfirewallrule_info.py b/lib/ansible/modules/cloud/azure/azure_rm_mysqlfirewallrule_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_mysqlfirewallrule_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_mysqlfirewallrule_facts.py index 65c59dbe033..c47b5213ce3 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_mysqlfirewallrule_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_mysqlfirewallrule_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_mysqlfirewallrule_info +module: azure_rm_mysqlfirewallrule_facts version_added: "2.8" short_description: Get Azure MySQL Firewall Rule facts. description: @@ -44,13 +44,13 @@ author: EXAMPLES = ''' - name: Get instance of MySQL Firewall Rule - azure_rm_mysqlfirewallrule_info: + azure_rm_mysqlfirewallrule_facts: resource_group: myResourceGroup server_name: server_name name: firewall_rule_name - name: List instances of MySQL Firewall Rule - azure_rm_mysqlfirewallrule_info: + azure_rm_mysqlfirewallrule_facts: resource_group: myResourceGroup server_name: server_name ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_postgresqlconfiguration_info.py b/lib/ansible/modules/cloud/azure/azure_rm_postgresqlconfiguration_facts.py similarity index 97% rename from lib/ansible/modules/cloud/azure/azure_rm_postgresqlconfiguration_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_postgresqlconfiguration_facts.py index 10e9daeb639..a7a1933b883 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_postgresqlconfiguration_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_postgresqlconfiguration_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_postgresqlconfiguration_info +module: azure_rm_postgresqlconfiguration_facts version_added: "2.8" short_description: Get Azure PostgreSQL Configuration facts. description: @@ -44,13 +44,13 @@ author: EXAMPLES = ''' - name: Get specific setting of PostgreSQL configuration - azure_rm_postgresqlconfiguration_info: + azure_rm_postgresqlconfiguration_facts: resource_group: myResourceGroup server_name: testpostgresqlserver name: deadlock_timeout - name: Get all settings of PostgreSQL Configuration - azure_rm_postgresqlconfiguration_info: + azure_rm_postgresqlconfiguration_facts: resource_group: myResourceGroup server_name: testpostgresqlserver ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_postgresqlfirewallrule_info.py b/lib/ansible/modules/cloud/azure/azure_rm_postgresqlfirewallrule_facts.py similarity index 97% rename from lib/ansible/modules/cloud/azure/azure_rm_postgresqlfirewallrule_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_postgresqlfirewallrule_facts.py index 5e20b211efb..04f33c8fc48 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_postgresqlfirewallrule_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_postgresqlfirewallrule_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_postgresqlfirewallrule_info +module: azure_rm_postgresqlfirewallrule_facts version_added: "2.8" short_description: Get Azure PostgreSQL Firewall Rule facts. description: @@ -44,13 +44,13 @@ author: EXAMPLES = ''' - name: Get instance of PostgreSQL Firewall Rule - azure_rm_postgresqlfirewallrule_info: + azure_rm_postgresqlfirewallrule_facts: resource_group: myResourceGroup server_name: server_name name: firewall_rule_name - name: List instances of PostgreSQL Firewall Rule - azure_rm_postgresqlfirewallrule_info: + azure_rm_postgresqlfirewallrule_facts: resource_group: myResourceGroup server_name: server_name ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_rediscache_info.py b/lib/ansible/modules/cloud/azure/azure_rm_rediscache_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_rediscache_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_rediscache_facts.py index 6d9c0f69839..0c5c32447c4 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_rediscache_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_rediscache_facts.py @@ -14,7 +14,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_rediscache_info +module: azure_rm_rediscache_facts version_added: "2.8" @@ -49,18 +49,18 @@ author: EXAMPLES = ''' - name: Get Azure Cache for Redis by name - azure_rm_rediscache_info: + azure_rm_rediscache_facts: resource_group: myResourceGroup name: myRedis - name: Get Azure Cache for Redis with access keys by name - azure_rm_rediscache_info: + azure_rm_rediscache_facts: resource_group: myResourceGroup name: myRedis return_access_keys: true - name: Get Azure Cache for Redis in specific resource group - azure_rm_rediscache_info: + azure_rm_rediscache_facts: resource_group: myResourceGroup ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_roleassignment_info.py b/lib/ansible/modules/cloud/azure/azure_rm_roleassignment_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_roleassignment_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_roleassignment_facts.py index a1bf0fe6c88..19999edbf83 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_roleassignment_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_roleassignment_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_roleassignment_info +module: azure_rm_roleassignment_facts 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_info: + azure_rm_roleassignment_facts: assignee: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx - name: Get role assignments for specific scope - azure_rm_roleassignment_info: + azure_rm_roleassignment_facts: scope: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_roledefinition_info.py b/lib/ansible/modules/cloud/azure/azure_rm_roledefinition_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_roledefinition_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_roledefinition_facts.py index a757a660c15..c83dff03865 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_roledefinition_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_roledefinition_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_roledefinition_info +module: azure_rm_roledefinition_facts 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_info: + azure_rm_roledefinition_facts: scope: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup - name: Get Role Definition by name - azure_rm_roledefinition_info: + azure_rm_roledefinition_facts: scope: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup name: myRoleDefinition ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_sqldatabase_info.py b/lib/ansible/modules/cloud/azure/azure_rm_sqldatabase_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_sqldatabase_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_sqldatabase_facts.py index ed72d0fe7c7..f281870e3c8 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_sqldatabase_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_sqldatabase_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_sqldatabase_info +module: azure_rm_sqldatabase_facts version_added: "2.8" short_description: Get Azure SQL Database facts. description: @@ -50,19 +50,19 @@ author: EXAMPLES = ''' - name: Get instance of SQL Database - azure_rm_sqldatabase_info: + azure_rm_sqldatabase_facts: resource_group: testrg server_name: testserver name: testdb - name: List instances of SQL Database - azure_rm_sqldatabase_info: + azure_rm_sqldatabase_facts: resource_group: testrg server_name: testserver elastic_pool_name: testep - name: List instances of SQL Database - azure_rm_sqldatabase_info: + azure_rm_sqldatabase_facts: resource_group: testrg server_name: testserver ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule_info.py b/lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule_facts.py index 28114a60c10..be79e642eab 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_sqlfirewallrule_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_sqlfirewallrule_info +module: azure_rm_sqlfirewallrule_facts version_added: "2.8" short_description: Get Azure SQL Firewall Rule facts. description: @@ -44,13 +44,13 @@ author: EXAMPLES = ''' - name: Get instance of SQL Firewall Rule - azure_rm_sqlfirewallrule_info: + azure_rm_sqlfirewallrule_facts: resource_group: myResourceGroup server_name: testserver name: testrule - name: List instances of SQL Firewall Rule - azure_rm_sqlfirewallrule_info: + azure_rm_sqlfirewallrule_facts: resource_group: myResourceGroup server_name: testserver ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_subnet_info.py b/lib/ansible/modules/cloud/azure/azure_rm_subnet_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_subnet_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_subnet_facts.py index c4a737aed97..30927847c18 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_subnet_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_subnet_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_subnet_info +module: azure_rm_subnet_facts 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_info: + azure_rm_subnet_facts: resource_group: myResourceGroup virtual_network_name: myVirtualNetwork name: mySubnet - name: List facts for all subnets in virtual network - azure_rm_subnet_info: + azure_rm_subnet_facts: resource_group: myResourceGroup virtual_network_name: myVirtualNetwork name: mySubnet diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py index 5909683ce65..f03519b1461 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py @@ -1894,8 +1894,8 @@ class AzureRMVirtualMachine(AzureRMModuleBase): if self.public_ip_allocation_method != 'Disabled': self.results['actions'].append('Created default public IP {0}'.format(self.name + '01')) sku = self.network_models.PublicIPAddressSku(name="Standard") if self.zones else None - pip_info = self.create_default_pip(self.resource_group, self.location, self.name + '01', self.public_ip_allocation_method, sku=sku) - pip = self.network_models.PublicIPAddress(id=pip_info.id, location=pip_info.location, resource_guid=pip_info.resource_guid, sku=sku) + pip_facts = self.create_default_pip(self.resource_group, self.location, self.name + '01', self.public_ip_allocation_method, sku=sku) + pip = self.network_models.PublicIPAddress(id=pip_facts.id, location=pip_facts.location, resource_guid=pip_facts.resource_guid, sku=sku) self.tags['_own_pip_'] = self.name + '01' self.results['actions'].append('Created default security group {0}'.format(self.name + '01')) diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachineextension_info.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachineextension_facts.py similarity index 98% rename from lib/ansible/modules/cloud/azure/azure_rm_virtualmachineextension_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_virtualmachineextension_facts.py index 1dc0caf88a7..c6e3e40679c 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachineextension_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachineextension_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_virtualmachineextension_info +module: azure_rm_virtualmachineextension_facts version_added: "2.8" short_description: Get Azure Virtual Machine Extension facts. description: @@ -47,13 +47,13 @@ author: EXAMPLES = ''' - name: Get information on specific Virtual Machine Extension - azure_rm_virtualmachineextension_info: + azure_rm_virtualmachineextension_facts: resource_group: myResourceGroup virtual_machine_name: myvm name: myextension - name: List installed Virtual Machine Extensions - azure_rm_virtualmachineextension_info: + azure_rm_virtualmachineextension_facts: resource_group: myResourceGroup virtual_machine_name: myvm ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescalesetextension_info.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescalesetextension_facts.py similarity index 97% rename from lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescalesetextension_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescalesetextension_facts.py index a10b046939e..957e1ea664a 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescalesetextension_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescalesetextension_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_virtualmachinescalesetextension_info +module: azure_rm_virtualmachinescalesetextension_facts version_added: "2.8" short_description: Get Azure Virtual Machine Scale Set Extension facts. description: @@ -44,13 +44,13 @@ author: EXAMPLES = ''' - name: Get information on specific Virtual Machine Scale Set Extension - azure_rm_virtualmachineextension_info: + azure_rm_virtualmachineextension_facts: resource_group: myResourceGroup vmss_name: myvmss name: myextension - name: List installed Virtual Machine Scale Set Extensions - azure_rm_virtualmachineextension_info: + azure_rm_virtualmachineextension_facts: resource_group: myrg vmss_name: myvmss ''' diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescalesetinstance_info.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescalesetinstance_facts.py similarity index 99% rename from lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescalesetinstance_info.py rename to lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescalesetinstance_facts.py index e9e7c37e670..fdb92e355a9 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescalesetinstance_info.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescalesetinstance_facts.py @@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', DOCUMENTATION = ''' --- -module: azure_rm_virtualmachinescalesetinstance_info +module: azure_rm_virtualmachinescalesetinstance_facts version_added: "2.8" short_description: Get Azure Virtual Machine Scale Set Instance facts. description: diff --git a/test/integration/targets/azure_rm_cdnprofile/tasks/main.yml b/test/integration/targets/azure_rm_cdnprofile/tasks/main.yml index 657881a5070..69550d9e2df 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_info: + azure_rm_cdnprofile_facts: resource_group: "{{ resource_group }}" name: "{{ cdnprofilename }}" register: fact @@ -43,7 +43,7 @@ - output.id != '' - name: Gather CDN profile facts - azure_rm_cdnprofile_info: + azure_rm_cdnprofile_facts: resource_group: "{{ resource_group }}" name: "{{ cdnprofilename }}" register: fact @@ -96,7 +96,7 @@ check_mode: yes - name: Gather CDN profile facts - azure_rm_cdnprofile_info: + azure_rm_cdnprofile_facts: 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_info: + azure_rm_cdnendpoint_facts: resource_group: "{{ resource_group }}" name: "{{ endpointname }}" profile_name: "{{ cdnprofilename }}" @@ -265,7 +265,7 @@ - output.changed - name: Get CDN profile fact - azure_rm_cdnprofile_info: + azure_rm_cdnprofile_facts: 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 a76e387a30b..13ce1a7a7bd 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_info: + azure_rm_containerinstance_facts: 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_info: + azure_rm_containerinstance_facts: 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 f50aa47c55f..cebf4e80fd1 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_info: + azure_rm_cosmosdbaccount_facts: 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_info: + azure_rm_cosmosdbaccount_facts: 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_info: + azure_rm_cosmosdbaccount_facts: 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_info: + azure_rm_cosmosdbaccount_facts: 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 fb3d1951512..e24b1472f0d 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_info: + azure_rm_deployment_facts: resource_group: "{{ resource_group }}" name: "{{ dns_label }}" register: output diff --git a/test/integration/targets/azure_rm_devtestlab/tasks/main.yml b/test/integration/targets/azure_rm_devtestlab/tasks/main.yml index d78d492e656..d91cc10e963 100644 --- a/test/integration/targets/azure_rm_devtestlab/tasks/main.yml +++ b/test/integration/targets/azure_rm_devtestlab/tasks/main.yml @@ -61,7 +61,7 @@ - output.changed - name: List DevTest Lab in a resource group - azure_rm_devtestlab_info: + azure_rm_devtestlab_facts: resource_group: "{{ resource_group }}" register: output_lab - name: Assert that facts are returned @@ -78,7 +78,7 @@ - output_lab.labs[0]['vault_name'] != None - name: Get DevTest Lab facts - azure_rm_devtestlab_info: + azure_rm_devtestlab_facts: resource_group: "{{ resource_group }}" name: "{{ lab_name }}" register: output_lab @@ -263,7 +263,7 @@ - output.changed - name: Get DevTest Lab Virtual Network facts - azure_rm_devtestlabvirtualnetwork_info: + azure_rm_devtestlabvirtualnetwork_facts: resource_group: "{{ resource_group }}" lab_name: "{{ lab_name }}" name: "{{ vn_name }}" @@ -281,7 +281,7 @@ - output.virtualnetworks[0]['provisioning_state'] != None - name: List all Virtual Networks in DevTest Lab - azure_rm_devtestlabvirtualnetwork_info: + azure_rm_devtestlabvirtualnetwork_facts: resource_group: "{{ resource_group }}" lab_name: "{{ lab_name }}" register: output @@ -458,7 +458,7 @@ when: "github_token | length > 0" - name: Get Facts of DTL Virtual Machine - azure_rm_devtestlabvirtualmachine_info: + azure_rm_devtestlabvirtualmachine_facts: resource_group: "{{ resource_group }}" lab_name: "{{ lab_name }}" name: "{{ vm_name }}" @@ -488,7 +488,7 @@ when: "github_token | length > 0" - name: List Facts of DTL Virtual Machine - azure_rm_devtestlabvirtualmachine_info: + azure_rm_devtestlabvirtualmachine_facts: resource_group: "{{ resource_group }}" lab_name: "{{ lab_name }}" register: output_vm @@ -516,7 +516,7 @@ - name: List all artifact sources - azure_rm_devtestlabartifactsource_info: + azure_rm_devtestlabartifactsource_facts: resource_group: "{{ resource_group }}" lab_name: "{{ lab_name }}" register: output @@ -537,7 +537,7 @@ - output.artifactsources | length >= 2 - name: Get artifacts source facts - azure_rm_devtestlabartifactsource_info: + azure_rm_devtestlabartifactsource_facts: resource_group: "{{ resource_group }}" lab_name: "{{ lab_name }}" name: public repo @@ -572,7 +572,7 @@ when: "github_token | length > 0" - name: List ARM Template facts - azure_rm_devtestlabarmtemplate_info: + azure_rm_devtestlabarmtemplate_facts: resource_group: "{{ resource_group }}" lab_name: "{{ lab_name }}" artifact_source_name: "public environment repo" @@ -591,7 +591,7 @@ - "output.armtemplates | length > 1" - name: Get ARM Template facts - azure_rm_devtestlabarmtemplate_info: + azure_rm_devtestlabarmtemplate_facts: resource_group: "{{ resource_group }}" lab_name: "{{ lab_name }}" artifact_source_name: "public environment repo" @@ -613,7 +613,7 @@ - name: Get Artifact facts - azure_rm_devtestlabartifact_info: + azure_rm_devtestlabartifact_facts: resource_group: "{{ resource_group }}" lab_name: "{{ lab_name }}" artifact_source_name: "public repo" @@ -635,7 +635,7 @@ - "output.artifacts | length > 1" - name: Get Artifact facts - azure_rm_devtestlabartifact_info: + azure_rm_devtestlabartifact_facts: resource_group: "{{ resource_group }}" lab_name: "{{ lab_name }}" artifact_source_name: "public repo" diff --git a/test/integration/targets/azure_rm_image/tasks/main.yml b/test/integration/targets/azure_rm_image/tasks/main.yml index 2ff96e7beae..7a7bc7095f7 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_info: + azure_rm_image_facts: resource_group: "{{ resource_group }}" name: testimage001 register: output diff --git a/test/integration/targets/azure_rm_mariadbserver/aliases b/test/integration/targets/azure_rm_mariadbserver/aliases index 3361f3a4e7a..1ca78d093c5 100644 --- a/test/integration/targets/azure_rm_mariadbserver/aliases +++ b/test/integration/targets/azure_rm_mariadbserver/aliases @@ -1,8 +1,8 @@ cloud/azure destructive shippable/azure/group8 -azure_rm_mariadbserver_info +azure_rm_mariadbserver_facts azure_rm_mariadbdatabase -azure_rm_mariadbdatabase_info +azure_rm_mariadbdatabase_facts azure_rm_mariadbfirewallrule -azure_rm_mariadbfirewallrule_info +azure_rm_mariadbfirewallrule_facts diff --git a/test/integration/targets/azure_rm_mariadbserver/tasks/main.yml b/test/integration/targets/azure_rm_mariadbserver/tasks/main.yml index 24ae90d0f52..5b33ffb951c 100644 --- a/test/integration/targets/azure_rm_mariadbserver/tasks/main.yml +++ b/test/integration/targets/azure_rm_mariadbserver/tasks/main.yml @@ -86,7 +86,7 @@ var: output - name: Gather facts MariaDB Server - azure_rm_mariadbserver_info: + azure_rm_mariadbserver_facts: resource_group: "{{ resource_group }}" name: mariadbsrv{{ rpfx }} register: output @@ -128,7 +128,7 @@ ccc: ddd - name: Gather facts MariaDB Server - azure_rm_mariadbserver_info: + azure_rm_mariadbserver_facts: resource_group: "{{ resource_group }}" name: mariadbsrv{{ rpfx }}second register: output @@ -150,7 +150,7 @@ - output.servers[0]['tags']['ccc'] == 'ddd' - name: Gather facts MariaDB Server - azure_rm_mariadbserver_info: + azure_rm_mariadbserver_facts: resource_group: "{{ resource_group }}" register: output - name: Assert that facts are returned @@ -255,7 +255,7 @@ name: testdatabase2 - name: Gather facts MariaDB Database - azure_rm_mariadbdatabase_info: + azure_rm_mariadbdatabase_facts: resource_group: "{{ resource_group }}" server_name: mariadbsrv{{ rpfx }} name: testdatabase @@ -271,7 +271,7 @@ - output.databases[0]['collation'] != None - name: Gather facts MariaDB Database - azure_rm_mariadbdatabase_info: + azure_rm_mariadbdatabase_facts: resource_group: "{{ resource_group }}" server_name: mariadbsrv{{ rpfx }} register: output @@ -395,7 +395,7 @@ - output.changed - name: Gather facts MariaDB Firewall Rule - azure_rm_mariadbfirewallrule_info: + azure_rm_mariadbfirewallrule_facts: resource_group: "{{ resource_group }}" server_name: mariadbsrv{{ rpfx }} name: firewallrule{{ rpfx }} @@ -412,7 +412,7 @@ - "output.rules | length == 1" - name: Gather facts MariaDB Firewall Rule - azure_rm_mariadbfirewallrule_info: + azure_rm_mariadbfirewallrule_facts: resource_group: "{{ resource_group }}" server_name: mariadbsrv{{ rpfx }} register: output @@ -463,7 +463,7 @@ state: absent - name: Gather facts MariaDB Firewall Rule - azure_rm_mariadbfirewallrule_info: + azure_rm_mariadbfirewallrule_facts: resource_group: "{{ resource_group }}" server_name: mariadbsrv{{ rpfx }} name: firewallrule{{ rpfx }} @@ -491,7 +491,7 @@ - output.changed - name: Try to delete default configuraion - azure_rm_mariadbconfiguration_info: + azure_rm_mariadbconfiguration_facts: resource_group: "{{ resource_group }}" server_name: mariadbsrv{{ rpfx }} name: event_scheduler @@ -561,7 +561,7 @@ - not output.changed - name: Gather facts MariaDB Configuration - azure_rm_mariadbconfiguration_info: + azure_rm_mariadbconfiguration_facts: resource_group: "{{ resource_group }}" server_name: mariadbsrv{{ rpfx }} name: event_scheduler @@ -578,7 +578,7 @@ - output.settings | length == 1 - name: Gather facts MariaDB Configuration - azure_rm_mariadbconfiguration_info: + azure_rm_mariadbconfiguration_facts: resource_group: "{{ resource_group }}" server_name: mariadbsrv{{ rpfx }} register: output diff --git a/test/integration/targets/azure_rm_mysqlserver/aliases b/test/integration/targets/azure_rm_mysqlserver/aliases index 6cdf0148535..9e3fd9ae689 100644 --- a/test/integration/targets/azure_rm_mysqlserver/aliases +++ b/test/integration/targets/azure_rm_mysqlserver/aliases @@ -5,6 +5,6 @@ azure_rm_mysqlserver_facts azure_rm_mysqldatabase azure_rm_mysqldatabase_facts azure_rm_mysqlfirewallrule -azure_rm_mysqlfirewallrule_info +azure_rm_mysqlfirewallrule_facts azure_rm_mysqlconfiguration -azure_rm_mysqlconfiguration_info +azure_rm_mysqlconfiguration_facts diff --git a/test/integration/targets/azure_rm_mysqlserver/tasks/main.yml b/test/integration/targets/azure_rm_mysqlserver/tasks/main.yml index 6316af47a94..8f51010d828 100644 --- a/test/integration/targets/azure_rm_mysqlserver/tasks/main.yml +++ b/test/integration/targets/azure_rm_mysqlserver/tasks/main.yml @@ -395,7 +395,7 @@ - output.changed - name: Gather facts MySQL Firewall Rule - azure_rm_mysqlfirewallrule_info: + azure_rm_mysqlfirewallrule_facts: resource_group: "{{ resource_group }}" server_name: mysqlsrv{{ rpfx }} name: firewallrule{{ rpfx }} @@ -412,7 +412,7 @@ - "output.rules | length == 1" - name: Gather facts MySQL Firewall Rule - azure_rm_mysqlfirewallrule_info: + azure_rm_mysqlfirewallrule_facts: resource_group: "{{ resource_group }}" server_name: mysqlsrv{{ rpfx }} register: output @@ -463,7 +463,7 @@ state: absent - name: Gather facts MySQL Firewall Rule - azure_rm_mysqlfirewallrule_info: + azure_rm_mysqlfirewallrule_facts: resource_group: "{{ resource_group }}" server_name: mysqlsrv{{ rpfx }} name: firewallrule{{ rpfx }} @@ -491,7 +491,7 @@ - output.changed - name: Try to delete default configuraion - azure_rm_mysqlconfiguration_info: + azure_rm_mysqlconfiguration_facts: resource_group: "{{ resource_group }}" server_name: mysqlsrv{{ rpfx }} name: event_scheduler @@ -561,7 +561,7 @@ - not output.changed - name: Gather facts MySQL Configuration - azure_rm_mysqlconfiguration_info: + azure_rm_mysqlconfiguration_facts: resource_group: "{{ resource_group }}" server_name: mysqlsrv{{ rpfx }} name: event_scheduler @@ -578,7 +578,7 @@ - output.settings | length == 1 - name: Gather facts MySQL Configuration - azure_rm_mysqlconfiguration_info: + azure_rm_mysqlconfiguration_facts: resource_group: "{{ resource_group }}" server_name: mysqlsrv{{ rpfx }} 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 716c6bebf05..2dbb338b1cf 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_info: + azure_rm_applicationsecuritygroup_facts: resource_group: "{{ resource_group }}" name: "{{ applicationsecuritygroup_name1 }}" register: facts diff --git a/test/integration/targets/azure_rm_postgresqlserver/aliases b/test/integration/targets/azure_rm_postgresqlserver/aliases index 51234ebd642..573a6a6748b 100644 --- a/test/integration/targets/azure_rm_postgresqlserver/aliases +++ b/test/integration/targets/azure_rm_postgresqlserver/aliases @@ -5,6 +5,6 @@ azure_rm_postgresqlserver_facts azure_rm_postgresqldatabase azure_rm_postgresqldatabase_facts azure_rm_postgresqlfirewallrule -azure_rm_postgresqlfirewallrule_info +azure_rm_postgresqlfirewallrule_facts azure_rm_postgresqlserverconfiguration -azure_rm_postgresqlserverconfiguration_info +azure_rm_postgresqlserverconfiguration_facts diff --git a/test/integration/targets/azure_rm_postgresqlserver/tasks/main.yml b/test/integration/targets/azure_rm_postgresqlserver/tasks/main.yml index 310d848936c..9464e5d5bfe 100644 --- a/test/integration/targets/azure_rm_postgresqlserver/tasks/main.yml +++ b/test/integration/targets/azure_rm_postgresqlserver/tasks/main.yml @@ -374,7 +374,7 @@ end_ip_address: 172.28.10.138 - name: Gather facts PostgreSQL Firewall Rule - azure_rm_postgresqlfirewallrule_info: + azure_rm_postgresqlfirewallrule_facts: resource_group: "{{ resource_group }}" server_name: postgresqlsrv{{ rpfx }} name: firewallrule{{ rpfx }} @@ -391,7 +391,7 @@ - "output.rules | length == 1" - name: Gather facts PostgreSQL Firewall Rule - azure_rm_postgresqlfirewallrule_info: + azure_rm_postgresqlfirewallrule_facts: resource_group: "{{ resource_group }}" server_name: postgresqlsrv{{ rpfx }} register: output @@ -455,7 +455,7 @@ state: absent - name: Gather facts PostgreSQL Firewall Rule - azure_rm_postgresqlfirewallrule_info: + azure_rm_postgresqlfirewallrule_facts: resource_group: "{{ resource_group }}" server_name: postgresqlsrv{{ rpfx }} name: firewallrule{{ rpfx }} @@ -531,7 +531,7 @@ - not output.changed - name: Gather facts PostgreSQL Configuration - azure_rm_postgresqlconfiguration_info: + azure_rm_postgresqlconfiguration_facts: resource_group: "{{ resource_group }}" server_name: postgresqlsrv{{ rpfx }} name: deadlock_timeout @@ -548,7 +548,7 @@ - output.settings | length == 1 - name: Gather facts PostgreSQL Configuration - azure_rm_postgresqlconfiguration_info: + azure_rm_postgresqlconfiguration_facts: resource_group: "{{ resource_group }}" server_name: postgresqlsrv{{ rpfx }} register: output diff --git a/test/integration/targets/azure_rm_rediscache/tasks/main.yml b/test/integration/targets/azure_rm_rediscache/tasks/main.yml index fe53b9846e3..fe23a28b3a5 100644 --- a/test/integration/targets/azure_rm_rediscache/tasks/main.yml +++ b/test/integration/targets/azure_rm_rediscache/tasks/main.yml @@ -37,7 +37,7 @@ - output.id - name: Get facts - azure_rm_rediscache_info: + azure_rm_rediscache_facts: resource_group: "{{ resource_group }}" name: "{{ redis_name }}" register: facts @@ -190,7 +190,7 @@ - output.id - name: Get facts - azure_rm_rediscache_info: + azure_rm_rediscache_facts: resource_group: "{{ resource_group }}" name: "{{ redis_name }}2" return_access_keys: True @@ -204,7 +204,7 @@ - facts.rediscaches[0].access_keys.primary != None - name: Wait for Redis provisioning to complete - azure_rm_rediscache_info: + azure_rm_rediscache_facts: resource_group: "{{ resource_group }}" name: "{{ redis_name }}2" register: facts diff --git a/test/integration/targets/azure_rm_roledefinition/tasks/main.yml b/test/integration/targets/azure_rm_roledefinition/tasks/main.yml index c011d66daae..da179736ccc 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_info: + azure_rm_roledefinition_facts: scope: "/subscriptions/{{ subscription_id }}/resourceGroups/{{ resource_group }}" type: custom register: facts @@ -62,7 +62,7 @@ - facts['roledefinitions'] | length > 1 - name: Get facts - azure_rm_roledefinition_info: + azure_rm_roledefinition_facts: scope: "/subscriptions/{{ subscription_id }}/resourceGroups/{{ resource_group }}" role_name: "{{ role_name }}" register: facts @@ -121,7 +121,7 @@ - output.changed - name: Get role definition facts - azure_rm_roledefinition_info: + azure_rm_roledefinition_facts: role_name: "{{ role_name }}" scope: "/subscriptions/{{ subscription_id }}/resourceGroups/{{ resource_group }}" type: custom @@ -159,7 +159,7 @@ - output.changed - name: Get facts - azure_rm_roleassignment_info: + azure_rm_roleassignment_facts: scope: "/subscriptions/{{ subscription_id }}/resourceGroups/{{ resource_group }}" assignee: "{{ principal_id }}" register: facts diff --git a/test/integration/targets/azure_rm_sqlserver/aliases b/test/integration/targets/azure_rm_sqlserver/aliases index 473ace268a2..cc458e8ee0c 100644 --- a/test/integration/targets/azure_rm_sqlserver/aliases +++ b/test/integration/targets/azure_rm_sqlserver/aliases @@ -3,6 +3,6 @@ destructive shippable/azure/group4 azure_rm_sqlserver_facts azure_rm_sqldatabase -azure_rm_sqldatabase_info +azure_rm_sqldatabase_facts azure_rm_sqlfirewallrule -azure_rm_sqlfirewallrule_info +azure_rm_sqlfirewallrule_facts diff --git a/test/integration/targets/azure_rm_sqlserver/tasks/main.yml b/test/integration/targets/azure_rm_sqlserver/tasks/main.yml index 9899ee5dee7..a85e25efb16 100644 --- a/test/integration/targets/azure_rm_sqlserver/tasks/main.yml +++ b/test/integration/targets/azure_rm_sqlserver/tasks/main.yml @@ -150,7 +150,7 @@ location: eastus - name: Gather facts SQL Database - azure_rm_sqldatabase_info: + azure_rm_sqldatabase_facts: resource_group: "{{ resource_group }}" server_name: sqlsrv{{ random_postfix }} name: database{{ random_postfix }} @@ -169,7 +169,7 @@ - output.databases[0].status != None - name: Gather facts SQL Database - azure_rm_sqldatabase_info: + azure_rm_sqldatabase_facts: resource_group: "{{ resource_group }}" server_name: sqlsrv{{ random_postfix }} register: output @@ -241,7 +241,7 @@ # test database facts without databases - name: Gather facts SQL Database - azure_rm_sqldatabase_info: + azure_rm_sqldatabase_facts: resource_group: "{{ resource_group }}" server_name: sqlsrv{{ random_postfix }} name: database{{ random_postfix }} @@ -253,7 +253,7 @@ - output.databases | length == 0 - name: Gather facts SQL Database - azure_rm_sqldatabase_info: + azure_rm_sqldatabase_facts: resource_group: "{{ resource_group }}" server_name: sqlsrv{{ random_postfix }} register: output @@ -318,7 +318,7 @@ end_ip_address: 172.28.10.138 - name: Gather facts SQL Firewall Rule - azure_rm_sqlfirewallrule_info: + azure_rm_sqlfirewallrule_facts: resource_group: "{{ resource_group }}" server_name: sqlsrv{{ random_postfix }} name: firewallrule{{ random_postfix }} @@ -335,7 +335,7 @@ - output.rules[0].end_ip_address != None - name: Gather facts SQL Firewall Rule - azure_rm_sqlfirewallrule_info: + azure_rm_sqlfirewallrule_facts: resource_group: "{{ resource_group }}" server_name: sqlsrv{{ random_postfix }} register: output @@ -371,7 +371,7 @@ state: absent - name: Gather facts SQL Firewall Rule - azure_rm_sqlfirewallrule_info: + azure_rm_sqlfirewallrule_facts: resource_group: "{{ resource_group }}" server_name: sqlsrv{{ random_postfix }} name: firewallrule{{ random_postfix }} diff --git a/test/integration/targets/azure_rm_subnet/tasks/main.yml b/test/integration/targets/azure_rm_subnet/tasks/main.yml index 1475b961f78..1d8d71d5673 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_info: + azure_rm_subnet_facts: name: foobar virtual_network_name: My_Virtual_Network resource_group: "{{ resource_group }}" diff --git a/test/integration/targets/azure_rm_virtualmachineextension/tasks/main.yml b/test/integration/targets/azure_rm_virtualmachineextension/tasks/main.yml index 7e80f7cac0c..e195ac731a8 100644 --- a/test/integration/targets/azure_rm_virtualmachineextension/tasks/main.yml +++ b/test/integration/targets/azure_rm_virtualmachineextension/tasks/main.yml @@ -84,7 +84,7 @@ that: results.changed - name: Query extension - azure_rm_virtualmachineextension_info: + azure_rm_virtualmachineextension_facts: resource_group: "{{ resource_group }}" name: testVMExtension virtual_machine_name: testVM @@ -105,7 +105,7 @@ - results.extensions[0]['provisioning_state'] != None - name: List extensions - azure_rm_virtualmachineextension_info: + azure_rm_virtualmachineextension_facts: resource_group: "{{ resource_group }}" virtual_machine_name: testVM register: results diff --git a/test/integration/targets/azure_rm_virtualmachinescaleset/tasks/main.yml b/test/integration/targets/azure_rm_virtualmachinescaleset/tasks/main.yml index 900b60df85e..ecebf01c461 100644 --- a/test/integration/targets/azure_rm_virtualmachinescaleset/tasks/main.yml +++ b/test/integration/targets/azure_rm_virtualmachinescaleset/tasks/main.yml @@ -214,7 +214,7 @@ - output_scaleset.vmss[0].load_balancer == "testLB1" - name: Retrieve scaleset VMs facts - azure_rm_virtualmachinescalesetinstance_info: + azure_rm_virtualmachinescalesetinstance_facts: resource_group: "{{ resource_group }}" vmss_name: testVMSS{{ rpfx }} register: instances @@ -293,7 +293,7 @@ that: not results.changed - name: Query extension - azure_rm_virtualmachinescalesetextension_info: + azure_rm_virtualmachinescalesetextension_facts: resource_group: "{{ resource_group }}" vmss_name: testVMSS{{ rpfx }} name: testExtension @@ -313,7 +313,7 @@ - results.extensions[0]['provisioning_state'] != None - name: List extensions - azure_rm_virtualmachinescalesetextension_info: + azure_rm_virtualmachinescalesetextension_facts: resource_group: "{{ resource_group }}" vmss_name: testVMSS{{ rpfx }} register: results