From 8026ef57fe024bc83076dd469d1c9fb25c6d1955 Mon Sep 17 00:00:00 2001 From: Thomas Stringer Date: Mon, 10 Jul 2017 12:54:39 -0400 Subject: [PATCH] remove option checking for azure vm sizes (enum will not contain all) as well as default and start requiring the vm_size param (#24406) --- .../modules/cloud/azure/azure_rm_virtualmachine.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py index bf5d0d08eb..b9ea7a9d77 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py @@ -90,8 +90,7 @@ options: description: - A valid Azure VM size value. For example, 'Standard_D4'. The list of choices varies depending on the subscription and location. Check your subscription for available choices. - default: Standard_D1 - required: false + required: true admin_username: description: - Admin username used to access the host after it is created. Required when creating a VM. @@ -487,7 +486,7 @@ class AzureRMVirtualMachine(AzureRMModuleBase): state=dict(choices=['present', 'absent'], default='present', type='str'), location=dict(type='str'), short_hostname=dict(type='str'), - vm_size=dict(type='str', choices=[], default='Standard_D1'), + vm_size=dict(type='str', required=True), admin_username=dict(type='str'), admin_password=dict(type='str', no_log=True), ssh_password_enabled=dict(type='bool', default=True), @@ -511,9 +510,6 @@ class AzureRMVirtualMachine(AzureRMModuleBase): started=dict(type='bool', default=True), ) - for key in VirtualMachineSizeTypes: - self.module_arg_spec['vm_size']['choices'].append(getattr(key, 'value')) - self.resource_group = None self.name = None self.state = None