From ee32222ae7e95a0175b6d96870a0b91901e6ebf3 Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Wed, 19 Jun 2019 17:00:43 +0800 Subject: [PATCH] fixing vmss failure (#56625) * triggering test * deleting autocreated as last one * fixed mistake --- lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py | 3 +++ .../modules/cloud/azure/azure_rm_virtualmachinescaleset.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py index 61bd2e7dfaa..44e19480aa5 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py @@ -1795,6 +1795,9 @@ class AzureRMVirtualMachine(AzureRMModuleBase): for pip_dict in pip_names: self.delete_pip(pip_dict['resource_group'], pip_dict['name']) + if 'all' in self.remove_on_absent or 'all_autocreated' in self.remove_on_absent: + self.remove_autocreated_resources(vm.tags) + return True def get_network_interface(self, resource_group, name): diff --git a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescaleset.py b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescaleset.py index 040bb4697b5..bda9f22ea57 100644 --- a/lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescaleset.py +++ b/lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescaleset.py @@ -210,7 +210,7 @@ options: version_added: "2.8" zones: description: - - A list of Availability Zones for your virtual machine scale set + - A list of Availability Zones for your virtual machine scale set. type: list version_added: "2.8" custom_data: