Merge pull request #167 from jvonau/dhcp2

sync from jvonau/iiab:dhcp2

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/<OS>.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

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
@@ -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 disabled"
+  when: dnsmasq_install and iiab_network_mode == "Appliance"
 
 - name: Add 'network' variable values (from computed_services.yml) to /etc/iiab/iiab.ini
   ini_file: