Page MenuHomeDevCentral
Files F24888396

D4006.diff
No OneTemporary
Actions

D4006.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
@@ -41,3 +41,8 @@
vfs.zfs.prefetch_disable=0
{% endif -%}
+
+# Enable CARP preemption
+{% if is_router -%}
+net.inet.carp.preempt=1
+{% 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,5 @@
- context:
use_zfs: {{ use_zfs }}
mem: {{ grains['mem_total'] }}
-
+ is_router: { { salt[ "node.has_role" ]("router") } }
{% endif %}
diff --git a/roles/router/carp/files/carp.conf b/roles/router/carp/files/carp.conf
new file mode 100644
--- /dev/null
+++ b/roles/router/carp/files/carp.conf
@@ -0,0 +1,16 @@
+# -------------------------------------------------------------
+# Network — loader configuration
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# Source file: roles/router/carp/files/carp.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>
+
+carp_load="YES"
diff --git a/roles/router/carp/init.sls b/roles/router/carp/init.sls
--- a/roles/router/carp/init.sls
+++ b/roles/router/carp/init.sls
@@ -12,3 +12,8 @@
- context:
carp_entries: {{ salt['node.get_carp_entries']() }}
- mode: '0644'
+
+/boot/loader.conf.d/carp.conf:
+ file.managed:
+ - source: salt://roles/router/carp/files/carp.conf
+ - mode: '0644'

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 17, 02:59 (13 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3538638
Default Alt Text
D4006.diff (1 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator