From cee870fb403fed47e8829623ff4745c142b01c51 Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Mon, 3 Apr 2017 22:35:02 +0200 Subject: [PATCH] Prefix dhcpd related variables with dhcpd --- roles/dhcpd/defaults/main.yml | 6 +++--- roles/dhcpd/templates/dhcpd.conf.j2 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/dhcpd/defaults/main.yml b/roles/dhcpd/defaults/main.yml index f87abc1..ed7484c 100644 --- a/roles/dhcpd/defaults/main.yml +++ b/roles/dhcpd/defaults/main.yml @@ -1,6 +1,6 @@ --- -dhcp_mtu: 1280 -dhcp_first: "{{ batman_ipv4 | ipaddr('512') | ipaddr('address') }}" -dhcp_last: "{{ batman_ipv4 | ipaddr('2558') | ipaddr('address') }}" +dhcpd_mtu: 1280 +dhcpd_first: "{{ batman_ipv4 | ipaddr('512') | ipaddr('address') }}" +dhcpd_last: "{{ batman_ipv4 | ipaddr('2558') | ipaddr('address') }}" name_server: "{{ batman_ipv4 | ipaddr('address') }}" diff --git a/roles/dhcpd/templates/dhcpd.conf.j2 b/roles/dhcpd/templates/dhcpd.conf.j2 index 285ca66..d86f69d 100644 --- a/roles/dhcpd/templates/dhcpd.conf.j2 +++ b/roles/dhcpd/templates/dhcpd.conf.j2 @@ -24,8 +24,8 @@ log-facility local7; # Freifunk Regensburg subnet {{ batman_ipv4 | ipaddr('network') }} netmask {{ batman_ipv4 | ipaddr('netmask') }} { option routers {{ batman_ipv4 | ipaddr('address') }}; - option interface-mtu {{ dhcp_mtu }}; + option interface-mtu {{ dhcpd_mtu }}; pool { - range {{ dhcp_first }} {{ dhcp_last }} ; + range {{ dhcpd_first }} {{ dhcpd_last }} ; } }