From 5f44c407dc1a6155e43169b8071bd29b2fecfbfa Mon Sep 17 00:00:00 2001
From: Marek Isalski <maz@hexes.tenebrae.faelix.org>
Date: Thu, 26 Mar 2020 07:28:34 +0000
Subject: [PATCH] defautl no-ipv4-unicast

---
 vyos.conf.j2 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vyos.conf.j2 b/vyos.conf.j2
index 2af460e..1545874 100644
--- a/vyos.conf.j2
+++ b/vyos.conf.j2
@@ -4,7 +4,7 @@
             {% if salt['pillar.get']('interfaces:'+iface_name+':ip:ospf') %}
             ospf {
                 {% if salt['pillar.get']('interfaces:'+iface_name+':ip:ospf:cost',None) != None %}cost {{ salt['pillar.get']('interfaces:'+iface_name+':ip:ospf:cost') }}{% endif %}
-                {% if salt['pillar.get']('interfaces:'+iface_name+':ip:ospf:passive') %}
+                {% if salt['pillar.get']('interfaces:'+iface_name+':ip:ospf:passive',False) %}
                 {% else %}
                 network {{ salt['pillar.get']('interfaces:'+iface_name+':ip:ospf:network') }}
                 dead-interval {{ salt['pillar.get']('interfaces:'+iface_name+':ip:ospf:dead-interval',40) }}
@@ -22,7 +22,7 @@
             ospfv3 {
                 {% if salt['pillar.get']('interfaces:'+iface_name+':ipv6:ospfv3:cost',None) != None %}cost {{ salt['pillar.get']('interfaces:'+iface_name+':ipv6:ospfv3:cost') }}{% endif %}
                 instance-id {{ salt['pillar.get']('interfaces:'+iface_name+':ipv6:ospfv3:instance-id',0) }}
-                {% if salt['pillar.get']('interfaces:'+iface_name+':ipv6:ospfv3:passive') %}
+                {% if salt['pillar.get']('interfaces:'+iface_name+':ipv6:ospfv3:passive',False) %}
                 passive
                 {% else %}
                 dead-interval {{ salt['pillar.get']('interfaces:'+iface_name+':ipv6:ospfv3:dead-interval',40) }}
@@ -228,6 +228,7 @@ protocols {
     bgp {{ bgp_as }} {
         parameters {
             router-id {{ as_data['parameters']['router-id'] }}
+            default no-ipv4-unicast
         }
         {% if as_data.get('address-family',None) %}
         address-family {