Browse Source

dhcp-server: Stretch versions of isc-dhcp-server use a different "defaults" format.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
Maximilian Wilhelm 6 years ago
parent
commit
7d1b818d51
2 changed files with 23 additions and 1 deletions
  1. 19 0
      dhcp-server/dhcpd.default.stretch
  2. 4 1
      dhcp-server/init.sls

+ 19 - 0
dhcp-server/dhcpd.default.stretch

@@ -0,0 +1,19 @@
+# Defaults for isc-dhcp-server (sourced by /etc/init.d/isc-dhcp-server)
+{%- set node_config = salt['pillar.get']('nodes:' ~ grains.id) %}
+
+# Path to dhcpd's config file (default: /etc/dhcp/dhcpd.conf).
+#DHCPDv4_CONF=/etc/dhcp/dhcpd.conf
+#DHCPDv6_CONF=/etc/dhcp/dhcpd6.conf
+
+# Path to dhcpd's PID file (default: /var/run/dhcpd.pid).
+#DHCPDv4_PID=/var/run/dhcpd.pid
+#DHCPDv6_PID=/var/run/dhcpd6.pid
+
+# Additional options to start dhcpd with.
+#	Don't use options -cf or -pf here; use DHCPD_CONF/ DHCPD_PID instead
+#OPTIONS=""
+
+# On what interfaces should the DHCP server (dhcpd) serve DHCP requests?
+#	Separate multiple interfaces with spaces, e.g. "eth0 eth1".
+INTERFACESv4="{% for iface in node_config.get('ifaces', {}) if iface.startswith ('br') %}{{ iface }} {% endfor %}"
+#INTERFACESv6=""

+ 4 - 1
dhcp-server/init.sls

@@ -24,7 +24,10 @@ isc-dhcp-server:
 
 /etc/default/isc-dhcp-server:
   file.managed:
-    - source: salt://dhcp-server/dhcpd.default
+    - source:
+      - salt://dhcp-server/dhcpd.default.{{ grains.oscodename }}
+      - salt://dhcp-server/dhcpd.default
+    - template: jinja
     - watch_in:
       - service: isc-dhcp-server