D3988.id10459.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3988.id10459.diff
View Options

	diff --git a/pillar/core/network.sls b/pillar/core/network.sls
	--- a/pillar/core/network.sls
	+++ b/pillar/core/network.sls
	@@ -34,8 +34,6 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	drake_gre_tunnels:
	-{%- for r in ["router-002", "router-003"] %}
	- {{ r }}:
	ysul:
	router:
	interface: gre0
	@@ -55,12 +53,7 @@
	interface: gre2
	addr: 172.27.27.254
	node:
	- {% if r == "router-002" %}
	addr: 172.27.27.36
	- {% else %}
	- addr: 172.27.27.37
	- {% endif %}
	-{%- endfor %}

	# -------------------------------------------------------------
	# IPsec configuration - strongSwan
	diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
	--- a/pillar/nodes/nodes.sls
	+++ b/pillar/nodes/nodes.sls
	@@ -246,6 +246,7 @@
	pool: zroot
	network:
	ipv6_tunnel: False
	+ canonical_public_ipv4: 51.68.252.230
	interfaces:
	intranought:
	device: vmx0
	@@ -263,6 +264,7 @@
	pool: zroot
	network:
	ipv6_tunnel: False
	+ canonical_public_ipv4: 51.68.252.230
	interfaces:
	intranought:
	device: vmx0