Fixed no undeploy feature in machine_operations to work with Provid…

…entia tags
ClarifiedSecurity · Sep 5, 2024 · cea2945 · cea2945
1 parent 98fca09
commit cea2945
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/nova/core/galaxy.yml b/nova/core/galaxy.yml
@@ -1,6 +1,6 @@
 namespace: nova
 name: core
-version: 3.3.9
+version: 3.3.10
 readme: README.md
 authors:
   - https://github.com/novateams

diff --git a/nova/core/roles/machine_operations/tasks/aws/remove.yml b/nova/core/roles/machine_operations/tasks/aws/remove.yml
@@ -2,7 +2,7 @@
 - name: NO UNDEPLOY OR IMMUTABLE SET
   ansible.builtin.fail:
     msg: "{{ inventory_hostname }} HAS no_undeploy or immutable SET AND WON'T BE REMOVED"
-  when: immutable or no_undeploy or 'immutable' in group_names or 'no_undeploy' in group_names
+  when: immutable or no_undeploy or 'immutable' in group_names or 'no_undeploy' in group_names or 'custom_no_undeploy' in group_names
 
 - name: Terminating {{ custom_vm_name | default(vm_name) }} EC2 instance...
   amazon.aws.ec2_instance:

diff --git a/nova/core/roles/machine_operations/tasks/linode/remove.yml b/nova/core/roles/machine_operations/tasks/linode/remove.yml
@@ -2,7 +2,7 @@
 - name: NO UNDEPLOY OR IMMUTABLE SET
   ansible.builtin.fail:
     msg: "{{ inventory_hostname }} HAS no_undeploy or immutable SET AND WON'T BE REMOVED"
-  when: immutable or no_undeploy or 'immutable' in group_names or 'no_undeploy' in group_names
+  when: immutable or no_undeploy or 'immutable' in group_names or 'no_undeploy' in group_names or 'custom_no_undeploy' in group_names
 
 - name: Deleting {{ custom_vm_name | default(vm_name) }} VM from Linode...
   linode.cloud.instance:

diff --git a/nova/core/roles/machine_operations/tasks/vmware_workstation/remove.yml b/nova/core/roles/machine_operations/tasks/vmware_workstation/remove.yml
@@ -2,7 +2,7 @@
 - name: NO UNDEPLOY OR IMMUTABLE SET
   ansible.builtin.fail:
     msg: "{{ inventory_hostname }} HAS no_undeploy or immutable SET AND WON'T BE REMOVED"
-  when: immutable or no_undeploy or 'immutable' in group_names or 'no_undeploy' in group_names
+  when: immutable or no_undeploy or 'immutable' in group_names or 'no_undeploy' in group_names or 'custom_no_undeploy' in group_names
 
 - name: Including VMware Workstation remove tasks...
   become: false

diff --git a/nova/core/roles/machine_operations/tasks/vsphere/remove.yml b/nova/core/roles/machine_operations/tasks/vsphere/remove.yml
@@ -2,7 +2,7 @@
 - name: NO UNDEPLOY OR IMMUTABLE SET
   ansible.builtin.fail:
     msg: "{{ inventory_hostname }} HAS no_undeploy or immutable SET AND WON'T BE REMOVED"
-  when: immutable or no_undeploy or 'immutable' in group_names or 'no_undeploy' in group_names
+  when: immutable or no_undeploy or 'immutable' in group_names or 'no_undeploy' in group_names or 'custom_no_undeploy' in group_names
 
 - name: Deleting {{ custom_vm_name | default(vm_name) }} VM...
   community.vmware.vmware_guest: