cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed vmss required parameters handling (#51012)

Browse source
This commit is contained in:
Zim Kalinowski 2019-01-18 10:25:47 +08:00 committed by GitHub
parent 30227ace98
commit 308e4c31c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/modules/cloud/azure/azure_rm_virtualmachine_scaleset.py
View file

@ -54,11 +54,9 @@ options:
description: description:
- A valid Azure VM size value. For example, 'Standard_D4'. The list of choices varies depending on the - 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. subscription and location. Check your subscription for available choices.
required: true
capacity: capacity:
description: description:
- Capacity of VMSS. - Capacity of VMSS.
required: true
default: 1 default: 1
tier: tier:
description: description:
@ -394,7 +392,7 @@ class AzureRMVirtualMachineScaleSet(AzureRMModuleBase):
state=dict(choices=['present', 'absent'], default='present', type='str'), state=dict(choices=['present', 'absent'], default='present', type='str'),
location=dict(type='str'), location=dict(type='str'),
short_hostname=dict(type='str'), short_hostname=dict(type='str'),
vm_size=dict(type='str', required=True), vm_size=dict(type='str'),
tier=dict(type='str', choices=['Basic', 'Standard']), tier=dict(type='str', choices=['Basic', 'Standard']),
capacity=dict(type='int', default=1), capacity=dict(type='int', default=1),
upgrade_policy=dict(type='str', choices=['Automatic', 'Manual']), upgrade_policy=dict(type='str', choices=['Automatic', 'Manual']),
@ -448,6 +446,11 @@ class AzureRMVirtualMachineScaleSet(AzureRMModuleBase):
self.overprovision = None self.overprovision = None
self.zones = None self.zones = None
required_if = [
('state', 'present', [
'vm_size'])
]
self.results = dict( self.results = dict(
changed=False, changed=False,
actions=[], actions=[],
@ -456,8 +459,8 @@ class AzureRMVirtualMachineScaleSet(AzureRMModuleBase):
super(AzureRMVirtualMachineScaleSet, self).__init__( super(AzureRMVirtualMachineScaleSet, self).__init__(
derived_arg_spec=self.module_arg_spec, derived_arg_spec=self.module_arg_spec,
supports_check_mode=True supports_check_mode=True,
) required_if=required_if)
def exec_module(self, **kwargs): def exec_module(self, **kwargs):

16
test/integration/targets/azure_rm_virtualmachine_scaleset/tasks/main.yml
View file

@ -263,14 +263,6 @@
resource_group: "{{ resource_group }}" resource_group: "{{ resource_group }}"
name: testVMSS{{ rpfx }} name: testVMSS{{ rpfx }}
state: absent state: absent
remove_on_absent: ['all']
vm_size: Standard_B1s
capacity: 1
image:
offer: CoreOS
publisher: CoreOS
sku: Stable
version: latest
- name: Create VMSS with security group in same resource group, with accelerated networking(check mode). - name: Create VMSS with security group in same resource group, with accelerated networking(check mode).
azure_rm_virtualmachine_scaleset: azure_rm_virtualmachine_scaleset:
@ -402,14 +394,6 @@
resource_group: "{{ resource_group }}" resource_group: "{{ resource_group }}"
name: testVMSS{{ rpfx }}2 name: testVMSS{{ rpfx }}2
state: absent state: absent
remove_on_absent: ['all']
vm_size: Standard_B1s
capacity: 1
image:
offer: CoreOS
publisher: CoreOS
sku: Stable
version: latest
- name: Fail when instance type is not supported to enable accelerated networking - name: Fail when instance type is not supported to enable accelerated networking
azure_rm_virtualmachine_scaleset: azure_rm_virtualmachine_scaleset: