D1097.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D1097.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
	@@ -36,6 +36,7 @@
	ipv4_interface: igb0
	ipv4_address: 163.172.49.16
	ipv4_gateway: 163.172.49.1
	+ ipv6_gateway: 2001:470:1f12:9e1::1
	ipv4_aliases:
	- 212.83.187.132
	ipv6_tunnel: True
	diff --git a/roles/core/network/files/routing.rc b/roles/core/network/files/routing.rc
	--- a/roles/core/network/files/routing.rc
	+++ b/roles/core/network/files/routing.rc
	@@ -14,3 +14,6 @@
	# </auto-generated>

	defaultrouter="{{ ipv4_gateway }}"
	+{% if ipv6_gateway != "" %}
	+ipv6_defaultrouter="{{ ipv6_gateway }}"
	+{% endif %}
	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
	@@ -33,6 +33,7 @@
	- template: jinja
	- context:
	ipv4_gateway: {{ network['ipv4_gateway'] }}
	+ ipv6_gateway: {{ network['ipv6_gateway'] \| default('') }}
	{% endif %}

	# -------------------------------------------------------------