From 0d07163059d936c202a9406db9370cf17469c49a Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Wed, 14 Apr 2021 19:53:16 +0000
Subject: [PATCH] Use OSPF more properly in fsol-gw hosts

---
 roles/bird/templates/bird.conf.j2           |  1 -
 roles/ifstated/templates/ifstated-fsol.conf | 27 ---------------------
 2 files changed, 28 deletions(-)

diff --git a/roles/bird/templates/bird.conf.j2 b/roles/bird/templates/bird.conf.j2
index a112a78..4feb320 100644
--- a/roles/bird/templates/bird.conf.j2
+++ b/roles/bird/templates/bird.conf.j2
@@ -8,7 +8,6 @@ protocol device {
 }
 
 protocol ospf {
-    disabled yes;
     area 0.0.0.0 {
         interface "tap0" {
             hello 1;
diff --git a/roles/ifstated/templates/ifstated-fsol.conf b/roles/ifstated/templates/ifstated-fsol.conf
index 6814ccd..49aec85 100644
--- a/roles/ifstated/templates/ifstated-fsol.conf
+++ b/roles/ifstated/templates/ifstated-fsol.conf
@@ -1,33 +1,6 @@
 
 init-state auto
 
-carp_up = "carp145.link.up"
-
 state auto {
     run "pfctl -f /etc/pf.conf"
-    if $carp_up {
-        set-state master
-    }
-    if ! $carp_up {
-        set-state backup
-    }
 }
-
-state backup {
-    init {
-        run "/usr/local/sbin/birdc disable ospf1"
-    }
-    if $carp_up {
-        set-state master
-    }
-}
-
-state master {
-    init {
-        run "/usr/local/sbin/birdc enable ospf1"
-    }
-    if !$carp_up {
-         set-state backup
-    }
-}
-