D4007.id10442.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D4007.id10442.diff
View Options

	diff --git a/roles/core/network/files/FreeBSD/gre.conf b/roles/core/network/files/FreeBSD/gre.conf
	new file mode 100644
	--- /dev/null
	+++ b/roles/core/network/files/FreeBSD/gre.conf
	@@ -0,0 +1,16 @@
	+# -------------------------------------------------------------
	+# Network — loader configuration
	+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
	+# Project: Nasqueron
	+# License: Trivial work, not eligible to copyright
	+# Source file: roles/core/network/files/FreeBSD/gre.conf
	+# -------------------------------------------------------------
	+#
	+# <auto-generated>
	+# This file is managed by our rOPS SaltStack repository.
	+#
	+# Changes to this file may cause incorrect behavior
	+# and will be lost if the state is redeployed.
	+# </auto-generated>
	+
	+if_gre_load="YES"
	diff --git a/roles/core/network/gre.sls b/roles/core/network/gre.sls
	--- a/roles/core/network/gre.sls
	+++ b/roles/core/network/gre.sls
	@@ -55,12 +55,10 @@
	{% if boot_loader.gre %}

	{% if grains['os'] == 'FreeBSD' %}
	-load_gre_kernel_module:
	- file.append:
	- - name: /boot/loader.conf
	- - text: \|
	-
	- if_gre_load="YES"
	+/boot/loader.conf.d/gre.conf:
	+ file.managed:
	+ - source: salt://roles/core/network/files/FreeBSD/gre.conf
	+ - mode: '0644'
	{% endif %}

	{% if grains['os_family'] == 'Debian' %}