8000 fixing vmss failure by zikalino · Pull Request #56625 · ansible/ansible · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fixing vmss failure #56625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 19, 2019
Merged

fixing vmss failure #56625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51d4177
triggering test
May 20, 2019
2ca696f
deleting autocreated as last one
May 21, 2019
750b5ab
fixed mistake
May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/ansible/modules/cloud/azure/azure_rm_virtualmachine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,9 +1774,6 @@ def delete_vm(self, vm):
except Exception as exc:
self.fail("Error deleting virtual machine {0} - {1}".format(self.name, str(exc)))

if 'all' in self.remove_on_absent or 'all_autocreated' in self.remove_on_absent:
self.remove_autocreated_resources(vm.tags)

# TODO: parallelize nic, vhd, and public ip deletions with begin_deleting
# TODO: best-effort to keep deleting other linked resources if we encounter an error
if self.remove_on_absent.intersection(set(['all', 'virtual_storage'])):
Expand All @@ -1795,6 +1792,9 @@ def delete_vm(self, vm):
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):
Expand Down
2 changes: 1 addition & 1 deletion lib/ansible/modules/cloud/azure/azure_rm_virtualmachinescaleset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
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:
Expand Down
0