From d63f828e8bbcbf9eb22c2df5b603e6db87de48e0 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Fri, 19 Mar 2021 18:17:02 +0000
Subject: [PATCH] network: Move OpenBSD CARP to use network_vip_interfaces

This will also change advskew option to priority and inverse functionality
so greatest value wins instead of lowest.
---
 roles/network/tasks/OpenBSD.yml          | 6 +++---
 roles/network/templates/hostname.carp.j2 | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/roles/network/tasks/OpenBSD.yml b/roles/network/tasks/OpenBSD.yml
index 23d38d3..df64693 100644
--- a/roles/network/tasks/OpenBSD.yml
+++ b/roles/network/tasks/OpenBSD.yml
@@ -18,15 +18,15 @@
         mode: 0600
         owner: root
         group: "{{ ansible_wheel }}"
-      with_items: "{{ network_carp_interfaces }}"
+      with_items: "{{ network_vip_interfaces }}"
       notify: restart network
     - name: enable carp preempt
       sysctl:
         name: net.inet.carp.preempt
         value: "1"
   when:
-    - network_carp_interfaces is defined
-    - network_carp_interfaces != []
+    - network_vip_interfaces is defined
+    - network_vip_interfaces != []
 
 - name: set default gateway
   copy:
diff --git a/roles/network/templates/hostname.carp.j2 b/roles/network/templates/hostname.carp.j2
index c899d29..c3a29cd 100644
--- a/roles/network/templates/hostname.carp.j2
+++ b/roles/network/templates/hostname.carp.j2
@@ -15,6 +15,6 @@ rtsol
 inet6 alias {{ item.ip6addr }} {{ item.ip6netmask }}
 {%   endif %}
 {% endif %}
-{% if item.advskew is defined %}
-advskew {{ item.advskew }}
+{% if item.priority is defined %}
+advskew {{ 240 - item.priority|int }}
 {% endif %}