D2596.id6552.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2596.id6552.diff
View Options

	diff --git a/roles/core/sysctl/files/sysctl.conf b/roles/core/sysctl/files/sysctl.conf
	--- a/roles/core/sysctl/files/sysctl.conf
	+++ b/roles/core/sysctl/files/sysctl.conf
	@@ -13,7 +13,13 @@
	# Changes to this file may cause incorrect behavior
	# and will be lost if the state is redeployed.
	# </auto-generated>
	+{% if is_router %}
	+# -------------------------------------------------------------
	+# Network
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	+net.inet.ip.forwarding=1
	+{% endif %}
	# -------------------------------------------------------------
	# VFS — kernel interface to file systems
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	@@ -21,7 +27,7 @@
	# Allow user to mount disks (required by FUSE or PEFS)
	vfs.usermount=1

	-{% if use_zfs %}
	+{%- if use_zfs %}

	{% if mem < 4096 %}
	# Maximum size of the Adaptive Replacement Cache (ARC).
	@@ -32,4 +38,4 @@
	# into the ARC in hopes that the data will be needed soon.
	vfs.zfs.prefetch_disable=0

	-{% endif %}
	+{% endif -%}
	diff --git a/roles/core/sysctl/init.sls b/roles/core/sysctl/init.sls
	--- a/roles/core/sysctl/init.sls
	+++ b/roles/core/sysctl/init.sls
	@@ -18,5 +18,6 @@
	- context:
	use_zfs: {{ use_zfs }}
	mem: {{ grains['mem_total'] }}
	+ is_router: {{ "router" in grains['roles'] }}

	{% endif %}