OpenBSD: redistribution of static/connected routes into OSPFv2/v3 (ipspace#2762)

Author: remilocherer

netsim/ansible/templates/ospf/openbsd.j2

@@ -1,5 +1,6 @@
 {% import "openbsd.ospfv2.j2" as ospfv2 %}
 {% import "openbsd.ospfv3.j2" as ospfv3 %}
+#!/bin/sh
 {% if ospf.af.ipv4 is defined %}
 {{   ospfv2.config(False,ospf,netlab_interfaces) }}
 {% endif %}

netsim/ansible/templates/ospf/openbsd.ospfv2.j2

@@ -1,7 +1,5 @@
 {% macro config(ospf_vrf,ospf_data,intf_data) %}
 {%- set areas = intf_data|selectattr('ipv4', 'defined')|map(attribute='ospf.area', default='')|reject('eq', '')|sort|unique %}
-#!/bin/sh
-
 cat <<OSPFD_CONF >/etc/ospfd.conf
 {% if ospf_data.router_id|ipv4 %}
 router-id {{ ospf_data.router_id }}
@@ -12,6 +10,11 @@ spf-holdtime msec 200
 {%   set dfd = ospf_data.default %}
 redistribute default set { metric {{ dfd.cost|default(100) }} type {{ dfd.type|default('e1')|replace('e','') }} }
 {% endif %}
+{% if ospf_data.import is defined %}
+{%   for proto in ospf_data.import %}
+redistribute {{ proto }}
+{%   endfor %}
+{% endif %}
 
 {% for a in areas %}
 area {{ a }} {

netsim/ansible/templates/ospf/openbsd.ospfv3.j2

@@ -1,7 +1,5 @@
 {% macro config(ospf_vrf,ospf_data,intf_data) %}
 {%- set areas = intf_data|selectattr('ipv6', 'defined')|map(attribute='ospf.area', default='')|reject('eq', '')|sort|unique %}
-#!/bin/sh
-
 cat <<OSPFD_CONF >/etc/ospf6d.conf
 {% if ospf_data.router_id is defined %}
 router-id {{ ospf_data.router_id }}
@@ -12,6 +10,11 @@ spf-holdtime 1
 {%   set dfd = ospf_data.default %}
 redistribute default set { metric {{ dfd.cost|default(100) }} type {{ dfd.type|default('e1')|replace('e','') }} }
 {% endif %}
+{% if ospf_data.import is defined %}
+{%   for proto in ospf_data.import %}
+redistribute {{ proto }} 
+{%   endfor %}
+{% endif %}
 
 {% for a in areas %}
 area {{ a }} {