D3383.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3383.diff
View Options

	diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
	--- a/pillar/nodes/nodes.sls
	+++ b/pillar/nodes/nodes.sls
	@@ -23,7 +23,6 @@
	roles:
	- opensearch
	network:
	- ipv6_native: True
	ipv6_tunnel: False

	canonical_public_ipv4: 188.165.200.229
	@@ -187,7 +186,6 @@
	- router
	network:
	ipv6_tunnel: False
	- ipv6_native: True

	canonical_public_ipv4: 51.255.124.8

	@@ -221,7 +219,6 @@
	- saas-wordpress
	network:
	ipv6_tunnel: False
	- ipv6_native: True

	canonical_public_ipv4: 51.255.124.10

	@@ -285,7 +282,6 @@
	zfs:
	pool: arcology
	network:
	- ipv6_native: True
	ipv6_tunnel: False

	canonical_public_ipv4: 51.159.17.168
	diff --git a/roles/core/network/ipv6.sls b/roles/core/network/ipv6.sls
	--- a/roles/core/network/ipv6.sls
	+++ b/roles/core/network/ipv6.sls
	@@ -29,8 +29,7 @@
	# with the assigned DUID.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	-{% if salt['node.has']('network:ipv6_native') %}
	- {% for interface_name, interface in network["interfaces"].items() %}
	+{% for interface_name, interface in network["interfaces"].items() %}
	{% if "ipv6" in interface %}

	{% if grains['os'] == 'FreeBSD' %}
	@@ -60,8 +59,7 @@

	{% endif %}
	{% endif %}
	- {% endfor %}
	-{% endif %}
	+{% endfor %}

	# -------------------------------------------------------------
	# 4to6 tunnel