From be829760c6d145b7733b2a868861a36a9640ecda Mon Sep 17 00:00:00 2001 From: "Andreas B. Mundt" Date: Fri, 29 Nov 2019 14:38:07 +0100 Subject: [PATCH] Improved DHCP configuration, no static IP addresses. --- installbox.yml | 3 +-- kerberox.yml | 3 +-- roles/dhcp-dns-dnsmasq/tasks/main.yml | 12 +++--------- roles/dhcp-dns-dnsmasq/templates/dnsmasq-dhcp.j2 | 1 + 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/installbox.yml b/installbox.yml index 7f64372..48e5d9f 100644 --- a/installbox.yml +++ b/installbox.yml @@ -17,8 +17,7 @@ ## LAN IP address range: ipaddr_lan: 192.168.0.10/24 - dhcp_range: 192.168.0.50,192.168.0.150,2h - dhcp_list: "{{ lookup('sequence', 'start=50 end=150 format=192.168.0.%d', wantlist=True) }}" + dhcp_range: 192.168.0.50,192.168.0.99,2h di_dist: "{{ ansible_distribution_release }}" di_version: "{{ ansible_distribution_major_version }}" diff --git a/kerberox.yml b/kerberox.yml index d45c1c2..c1594ca 100644 --- a/kerberox.yml +++ b/kerberox.yml @@ -16,8 +16,7 @@ ## LAN IP address range: ipaddr_lan: 192.168.0.10/24 - dhcp_range: 192.168.0.50,192.168.0.150,2h - dhcp_list: "{{ lookup('sequence', 'start=50 end=150 format=192.168.0.%d', wantlist=True) }}" + dhcp_range: 192.168.0.50,192.168.0.99,2h di_dist: "{{ ansible_distribution_release }}" di_version: "{{ ansible_distribution_major_version }}" diff --git a/roles/dhcp-dns-dnsmasq/tasks/main.yml b/roles/dhcp-dns-dnsmasq/tasks/main.yml index d0e4bf6..48bae66 100644 --- a/roles/dhcp-dns-dnsmasq/tasks/main.yml +++ b/roles/dhcp-dns-dnsmasq/tasks/main.yml @@ -4,17 +4,11 @@ - name: install dnsmasq package apt: - name: dnsmasq + name: + - dnsmasq + - resolvconf state: latest -- name: add client hostnames and IP addresses to /etc/hosts - lineinfile: - dest: /etc/hosts - line: "{{ item.1 }}\t{{ 'debian%03d' | format(item.0) }}" - with_indexed_items: "{{ dhcp_list }}" - notify: "restart dnsmasq" - when: not dnsmasq.stat.exists - - name: configure dnsmasq template: src: dnsmasq-dhcp.j2 diff --git a/roles/dhcp-dns-dnsmasq/templates/dnsmasq-dhcp.j2 b/roles/dhcp-dns-dnsmasq/templates/dnsmasq-dhcp.j2 index a6ca62b..61f82c2 100644 --- a/roles/dhcp-dns-dnsmasq/templates/dnsmasq-dhcp.j2 +++ b/roles/dhcp-dns-dnsmasq/templates/dnsmasq-dhcp.j2 @@ -1,2 +1,3 @@ interface={{ if_lan }} dhcp-range={{ dhcp_range }} +dhcp-generate-names