Page MenuHomeDevCentral
Files F3752654

D2113.id5330.diff
No OneTemporary
Actions

D2113.id5330.diff
View Options

diff --git a/roles/core/network/files/netif.rc b/roles/core/network/files/netif.rc
--- a/roles/core/network/files/netif.rc
+++ b/roles/core/network/files/netif.rc
@@ -21,6 +21,3 @@
{% for ip in ipv4_aliases %}
ifconfig_{{ interface }}_alias{{ loop.index0 }}="inet {{ ip }} netmask 255.255.255.255"
{% endfor %}
-{% if has_native_ipv6 %}
-ifconfig_{{ ipv6_interface }}_ipv6="inet6 accept_rtadv"
-{% endif %}
diff --git a/roles/core/network/files/netif.rc b/roles/core/network/files/netif_ipv6.rc
copy from roles/core/network/files/netif.rc
copy to roles/core/network/files/netif_ipv6.rc
--- a/roles/core/network/files/netif.rc
+++ b/roles/core/network/files/netif_ipv6.rc
@@ -3,7 +3,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
-# Source file: roles/core/network/files/netif.rc
+# Source file: roles/core/network/files/netif_ipv6.rc
# -------------------------------------------------------------
#
# <auto-generated>
@@ -13,14 +13,4 @@
# and will be lost if the state is redeployed.
# </auto-generated>
-{% if dhcp_required %}
-ifconfig_{{ interface }}="DHCP"
-{% else %}
-ifconfig_{{ interface }}="inet {{ ipv4_address }} netmask {{ ipv4_netmask }}"
-{% endif %}
-{% for ip in ipv4_aliases %}
-ifconfig_{{ interface }}_alias{{ loop.index0 }}="inet {{ ip }} netmask 255.255.255.255"
-{% endfor %}
-{% if has_native_ipv6 %}
-ifconfig_{{ ipv6_interface }}_ipv6="inet6 accept_rtadv"
-{% endif %}
+ifconfig_{{ interface }}_ipv6="inet6 accept_rtadv"
diff --git a/roles/core/network/init.sls b/roles/core/network/init.sls
--- a/roles/core/network/init.sls
+++ b/roles/core/network/init.sls
@@ -42,6 +42,21 @@
# IPv6
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+{% if salt['node.has']('network:ipv6_native') %}
+{% if grains['os'] == 'FreeBSD' %}
+/etc/rc.conf.d/netif/ipv6_{{ network['ipv6_interface'] }}:
+ file.managed:
+ - source: salt://roles/core/network/files/netif_ipv6.rc
+ - makedirs: True
+ - template: jinja
+ - context:
+ interface: {{ network['ipv6_interface'] }}
+ ipv6_address: {{ network['ipv6_address'] }}
+ ipv6_prefix: {{ network['ipv6_prefix'] | default(64) }}
+ has_native_ipv6: True
+{% endif %}
+{% endif %}
+
{% if salt['node.has']('network:ipv6_tunnel') %}
network_ipv6:
file.managed:

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 18, 20:30 (19 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2250997
Default Alt Text
D2113.id5330.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator