diff options
| author | Zim Kalinowski <zikalino@microsoft.com> | 2018-05-23 12:49:04 +0800 |
|---|---|---|
| committer | ansibot <ansibot@users.noreply.github.com> | 2018-05-23 00:49:04 -0400 |
| commit | 8e3866828579a60f5135946cb176c2a6315a0033 (patch) | |
| tree | 3c975be5ef0f5dc46dcb35b703d6325ddb5c6ccd /lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_scaleset.py | |
| parent | 9bc5dd5d092362ad323fb347768d16066945a601 (diff) | |
| download | ansible-8e3866828579a60f5135946cb176c2a6315a0033.tar.gz | |
fixing disabled azure sanity tests (#40519)
* fixing azure sanity tests
* fixing sanity
* fixing some tags issues
* removed unnecessary things from managed disk
* fixed location problem
* more sanity fixes
* sanity test fixes
* final sanity fixes?
* final fixes again
* undo changes related to container instance
* removed container instance
* readd again
* fixed stupid mistake
* removed _azure from changes
* one more mistake
Diffstat (limited to 'lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_scaleset.py')
| -rw-r--r-- | lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_scaleset.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_scaleset.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_scaleset.py index 25b9da0fe4..4a1078e945 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_scaleset.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_scaleset.py @@ -47,6 +47,10 @@ options: location: description: - Valid Azure location. Defaults to location of the resource group. + short_hostname: + description: + - Short host name + version_added: 2.6 vm_size: description: - A valid Azure VM size value. For example, 'Standard_D4'. The list of choices varies depending on the @@ -56,6 +60,7 @@ options: description: - Capacity of VMSS. required: true + default: 1 tier: description: - SKU Tier. @@ -79,6 +84,7 @@ options: description: - When the os_type is Linux, setting ssh_password_enabled to false will disable SSH password authentication and require use of SSH keys. + type: bool default: true ssh_public_keys: description: @@ -117,8 +123,7 @@ options: choices: - Windows - Linux - default: - - Linux + default: Linux managed_disk_type: description: - Managed disk type. |