bird/gateways: update for multidomain

_modules/domain.py

@@ -18,5 +18,4 @@ def radv_enabled(domain_key):
     host = __salt__['pillar.get']('radv:enabled', True)
     domain = __salt__['pillar.get'](
         'domains:%s:radv:enabled' % domain_key, True)
-
     return host and domain

bird/files/gateway/direct.conf.j2

 protocol direct d_domains {
-    interface {% for name in pillar['domains'].keys() -%} "{{ name }}-br"{% if not loop.last %}, {% endif %}{% endfor %};
+	interface {% for domain in pillar['domains'].values() -%} "dom{{ domain['domain_id'] }}-br"{% if not loop.last %}, {% endif %}{% endfor %};
 }

bird/files/gateway/radv.conf.j2

-protocol radv radv_{{ domain }} {
-	{%- if not salt['pillar.get']('domains:%s:radv:enabled'|format(domain), True) %}
+protocol radv radv_dom{{ domain_id }} {
+	{%- if not salt['domains.radv_enabled'](domain) %}
 	disabled;
 	{%- endif %}
-	interface "{{ domain }}-br" {
+	interface "dom{{ domain_id }}-br" {
+		min delay {{ salt['pillar.get']('radv:min_delay', 3) }};
 		other config yes;
 		{%- for prefix in pillar['domains'][domain]['IPv6']['subnets'].keys() %}
 		prefix {{ prefix }} { };
@@ -13,10 +14,10 @@ protocol radv radv_{{ domain }} {
 			{%- endfor %}
 		};
 		dnssl {
-			{%- for domain in pillar['domains'][domain]['search'] %}
+			{%- for domain in salt['pillar.get']('domains:%s:search'|format(domain)) %}
 			domain "{{ domain }}";
 			{%- endfor %}
 		};
-		link mtu {{ pillar['domains'][domain]['mtu'] }};
+		link mtu {{ salt['pillar.get']('domains:%s:mtu'|format(domain)) - 32 }};
 	};
 }