fix: Wait for the instances to return to the current host

handlers/main.yml

@@ -59,3 +59,35 @@
   retries: 100
   delay: 36
   ignore_errors: true
+
+- name: Disable maintenance mode on node
+  ansible.builtin.command:
+    argv:
+      - ha-manager
+      - crm-command
+      - node-maintenance
+      - disable
+      - "{{ inventory_hostname_short }}"
+  become: true
+  register: proxmox_maintenance_disabled
+  changed_when: proxmox_maintenance_disabled.rc == 0
+  listen: Disable maintenance mode
+
+- name: Wait for the instances to return to the current host
+  community.proxmox.proxmox_vm_info:
+    api_host: "{{ proxmox_api_host }}"
+    api_token_id: "{{ proxmox_api_token_id }}"
+    api_token_secret: "{{ proxmox_api_token_secret }}"
+    api_user: "{{ proxmox_api_user }}"
+    node: "{{ inventory_hostname_short }}"
+    type: all
+    validate_certs: "{{ proxmox_api_validate_certs }}"
+  become: true
+  register: proxmox_current_instances
+  retries: 20
+  delay: 30
+  until: current == expected
+  vars:
+    current: "{{ proxmox_current_instances.proxmox_vms | map(attribute='name') | sort }}"
+    expected: "{{ proxmox_node_instances.proxmox_vms | map(attribute='name') | sort }}"
+  listen: Disable maintenance mode

tasks/node_update.yml

@@ -17,6 +17,18 @@
 - name: Upgrade tasks
   when: apt_upgradable.stdout_lines | length > 1
   block:
+    - name: List instance on the current node
+      community.proxmox.proxmox_vm_info:
+        api_host: "{{ proxmox_api_host }}"
+        api_token_id: "{{ proxmox_api_token_id }}"
+        api_token_secret: "{{ proxmox_api_token_secret }}"
+        api_user: "{{ proxmox_api_user }}"
+        node: "{{ inventory_hostname_short }}"
+        type: all
+        validate_certs: "{{ proxmox_api_validate_certs }}"
+      become: true
+      register: proxmox_node_instances
+
     - name: Enable maintenance node
       ansible.builtin.command:
         argv:
@@ -28,6 +40,7 @@
       become: true
       register: proxmox_maintenance_enabled
       changed_when: proxmox_maintenance_enabled.rc == 0
+      notify: Disable maintenance mode
 
     - name: Wait for the instances to be migrated
       community.proxmox.proxmox_vm_info:
@@ -42,7 +55,7 @@
       register: proxmox_current_instances
       retries: 20
       delay: 30
-      until: proxmox_current_instances.proxmox_vms | selectattr('hastate', 'equalto', 'started') | list | length == 0
+      until: proxmox_current_instances.proxmox_vms | selectattr('hastate', 'defined') | selectattr('hastate', 'equalto', 'started') | list | length == 0
 
     - name: Run the full-upgrade
       ansible.builtin.apt:
@@ -81,33 +94,11 @@
           split('/') | first | list
       check_mode: true
 
-- name: Disable maintenance node
-  ansible.builtin.command:
-    argv:
-      - ha-manager
-      - crm-command
-      - node-maintenance
-      - disable
-      - "{{ inventory_hostname_short }}"
+    - name: Autoremove apt packages
+      ansible.builtin.apt:
+        autoremove: true
+        purge: true
       become: true
-  register: proxmox_maintenance_disabled
-  changed_when: proxmox_maintenance_disabled.rc == 0
 
-- name: Wait for the node to come out of maintenance
-  ansible.builtin.command: # noqa: no-changed-when
-    argv:
-      - ha-manager
-      - status
-  become: true
-  register: proxmox_ha_manager_status
-  changed_when: >-
-    proxmox_ha_manager_status.stdout_lines |
-    select('search', 'lrm ' + inventory_hostname_short) |
-    regex_search('active', ignorecase=true)
-  retries: 20
-  delay: 30
-  until: >-
-    not
-    proxmox_ha_manager_status.stdout_lines |
-    select('search', 'lrm ' + inventory_hostname_short) |
-    regex_search('active', ignorecase=true)
+- name: Flush handlers
+  ansible.builtin.meta: flush_handlers