From dfab364a19c15dc3ab0d1e86a6a67bf755fe426d Mon Sep 17 00:00:00 2001 From: Fred-sun <37327967+Fred-sun@users.noreply.github.com> Date: Fri, 17 May 2019 14:59:38 +0800 Subject: [PATCH] Update azure_rm_containerinstance related module document (#56556) --- .../cloud/azure/azure_rm_containerinstance.py | 12 +++++++++--- .../cloud/azure/azure_rm_containerinstance_facts.py | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/ansible/modules/cloud/azure/azure_rm_containerinstance.py b/lib/ansible/modules/cloud/azure/azure_rm_containerinstance.py index 438b23720c..ba6b214482 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_containerinstance.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_containerinstance.py @@ -17,7 +17,7 @@ DOCUMENTATION = ''' --- module: azure_rm_containerinstance version_added: "2.5" -short_description: Manage an Azure Container Instance. +short_description: Manage an Azure Container Instance description: - Create, update and delete an Azure Container Instance. @@ -46,7 +46,8 @@ options: - present ip_address: description: - - The IP address type of the container group (default is 'none') + - The IP address type of the container group. + - Default is C(none) and creating an instance without public IP. choices: - public - none @@ -59,6 +60,8 @@ options: ports: description: - List of ports exposed within the container group. + - This option is deprecated, using I(ports) under I(containers)". + type: list location: description: - Valid azure location. Defaults to location of the resource group. @@ -87,14 +90,17 @@ options: memory: description: - The required memory of the containers in GB. + type: float default: 1.5 cpu: description: - The required number of CPU cores of the containers. + type: float default: 1 ports: description: - List of ports exposed within the container group. + type: list environment_variables: description: - List of container environment variables. @@ -162,7 +168,7 @@ EXAMPLES = ''' RETURN = ''' id: description: - - Resource ID + - Resource ID. returned: always type: str sample: /subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/myResourceGroup/providers/Microsoft.ContainerInstance/containerGroups/aci1b6dd89 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 d1bac9d636..e8506b6882 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_containerinstance_facts.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_containerinstance_facts.py @@ -17,7 +17,7 @@ DOCUMENTATION = ''' --- module: azure_rm_containerinstance_facts version_added: "2.8" -short_description: Get Azure Container Instance facts. +short_description: Get Azure Container Instance facts description: - Get facts of Container Instance.