Removal works

roles/teardown_node/tasks/main.yml

@@ -3,18 +3,38 @@
 ### DO NOT CHANGE BELOW THIS LINE ######################################################################################
 ########################################################################################################################
 
+- name: Retrieve node lock
+  openstack.cloud.server_info:
+    server: "OSSDIP {{ instance }}"
+    filters:
+      locked: true
+  register: vm_locked
+
+- name: Unlock node
+  openstack.cloud.server_action:
+    server: "OSSDIP {{ instance }}"
+    action: unlock
+  when: vm_locked.openstack_servers | length > 0
+
 - name: Get ports
   openstack.cloud.port_info:
     port: "ossdip-analyst-{{ node }}*"
   register: port_result
-
-- debug: var=port_result
+  when: node is defined
 
 - name: Delete port
   openstack.cloud.port:
     state: absent
     name: "{{ item.name }}"
   with_items: "{{ port_result.openstack_ports }}"
+  when: node is defined
+
+- name: Delete port
+  openstack.cloud.port:
+    state: absent
+    name: "ossdip-{{ id }}-{{ item.name }}"
+  with_items: "{{ vms[id].networks }}"
+  when: node is undefined
 
 - name: Delete floating ip
   openstack.cloud.floating_ip:

teardown.yml

@@ -48,19 +48,6 @@
         instance: VPN Node
   tags: node
 
-#- hosts: controlnode
-#  become: yes
-#  roles:
-#    - role: unlock_node
-#      vars:
-#        instance: Key Node
-#
-#    - role: teardown_node
-#      vars:
-#        id: key
-#        instance: Key Node
-#  tags: node
-
 - hosts: controlnode
   become: yes
   roles: