From c0d887eed2fcd2d242f4649e6e83d34d6cda4267 Mon Sep 17 00:00:00 2001 From: "Ben D." Date: Wed, 29 Apr 2026 10:03:05 -0700 Subject: [PATCH] Updated to support split carp roles --- roles/pfsense_upgrade/tasks/main.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/roles/pfsense_upgrade/tasks/main.yml b/roles/pfsense_upgrade/tasks/main.yml index 0b780d5..b9c8027 100644 --- a/roles/pfsense_upgrade/tasks/main.yml +++ b/roles/pfsense_upgrade/tasks/main.yml @@ -13,15 +13,15 @@ ansible.builtin.import_tasks: update_check.yml tags: [always, check] -# --- CARP/HA PRE-UPGRADE LOGIC (before upgrade) --- -- name: Include CARP/HA pre-upgrade logic - ansible.builtin.import_tasks: carp.yml +# CARP pre-upgrade (demotion) +- name: Include CARP pre-upgrade logic + ansible.builtin.import_tasks: carp_pre.yml tags: [always, check, carp] when: - ha_peer is defined - ha_peer | length > 0 -# --- UPGRADE EXECUTION --- +# Upgrade execution - name: Include upgrade execution ansible.builtin.import_tasks: upgrade.yml tags: [upgrade] @@ -29,15 +29,16 @@ - perform_upgrade | bool - upgrade_available | bool -# --- CARP/HA POST-UPGRADE RESTORE (after upgrade) --- -- name: Include CARP/HA post-upgrade restore - ansible.builtin.import_tasks: carp.yml +# CARP post-upgrade (restore) +- name: Include CARP post-upgrade restore + ansible.builtin.import_tasks: carp_post.yml tags: [upgrade, carp] when: - ha_peer is defined - ha_peer | length > 0 - perform_upgrade | bool +# Verification - name: Include post-upgrade verification ansible.builtin.import_tasks: verify.yml tags: [upgrade, verify]