From bb6b3c2ab252791b25ea0ad0ba2cd3f85bd1b440 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 9 Oct 2018 11:48:40 -0500 Subject: [PATCH 1/2] Explicitly disable dnsmasq when in Appliance mode otherwise dnsmasq will become active upon reboot because enable_services.yml would still be acting upon local_vars.yml where dnsmasq_enabled is set to True while there is not LAN interface available to bind the service to. --- roles/network/defaults/main.yml | 2 -- roles/network/tasks/computed_services.yml | 11 ++++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml index 017a268f0..b1917cca2 100644 --- a/roles/network/defaults/main.yml +++ b/roles/network/defaults/main.yml @@ -65,8 +65,6 @@ services_externally_visible: False # DNS / name resolution dhcpd_install: True dhcpd_enabled: True -#dhcp_service: ???? # Set in individual OS's /opt/iiab/iiab/vars/.yml for use in roles/network/tasks/dhcpd.yml -dhcp_service2: disabled # Proposed by @jvonau to solve #1184 -> PR #1185 during transition from named to dnsmasq, as required by roles/network/tasks/computed_services.yml named_install: True named_enabled: False dnsmasq_enabled: True diff --git a/roles/network/tasks/computed_services.yml b/roles/network/tasks/computed_services.yml index 9baa95dd1..e0e3470a4 100644 --- a/roles/network/tasks/computed_services.yml +++ b/roles/network/tasks/computed_services.yml @@ -37,8 +37,17 @@ set_fact: named_enabled: False dhcpd_enabled: False + dnsmasq_enabled: True dhcp_service2: "dnsmasq" - when: dnsmasq_install and dnsmasq_enabled and iiab_network_mode != "Appliance" + when: dnsmasq_install and iiab_network_mode != "Appliance" + +- name: LAN not configured - dnsmasq + set_fact: + named_enabled: False + dhcpd_enabled: False + dnsmasq_enabled: False + dhcp_service2: "dnsmasq" + when: dnsmasq_install and iiab_network_mode == "Appliance" - name: Add 'network' variable values (from computed_services.yml) to /etc/iiab/iiab.ini ini_file: From 9d616cf3018bf7ec2ea7891fca8fdc04ca5907dc Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 9 Oct 2018 12:19:42 -0500 Subject: [PATCH 2/2] explicitly identify which primary dhcp server is being disabled dhcp_service2 is used in restart.yml when not in Appliance mode --- roles/network/tasks/computed_services.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/network/tasks/computed_services.yml b/roles/network/tasks/computed_services.yml index e0e3470a4..ada13d6ab 100644 --- a/roles/network/tasks/computed_services.yml +++ b/roles/network/tasks/computed_services.yml @@ -23,7 +23,7 @@ set_fact: named_enabled: True dhcpd_enabled: False - dhcp_service2: "dhcpd" + dhcp_service2: "dhcpd disabled" when: not dnsmasq_enabled and iiab_network_mode == "Appliance" - name: LAN configured - non-dnsmasq @@ -46,7 +46,7 @@ named_enabled: False dhcpd_enabled: False dnsmasq_enabled: False - dhcp_service2: "dnsmasq" + dhcp_service2: "dnsmasq disabled" when: dnsmasq_install and iiab_network_mode == "Appliance" - name: Add 'network' variable values (from computed_services.yml) to /etc/iiab/iiab.ini