Merge pull request #772 from jvonau/appl_mode

Remove br0 in Appliance Mode for NetworkManager (e.g. if no internal WiFi)

roles/network/defaults/main.yml

@@ -19,8 +19,8 @@ discovered_wired_iface: "none"
 discovered_wireless_iface: "none"
 
 #Redhat
-iiab_wired_lan_iface: "none"
+#iiab_wired_lan_iface: "none"
-iiab_wireless_lan_iface: "none"
+#iiab_wireless_lan_iface: "none"
 has_WAN: False
 has_ifcfg_gw: "none"
 has_wifi_gw: "none"

roles/network/tasks/NM-debian.yml

@@ -18,6 +18,12 @@
     src: network/bridge-br0
     mode: 0600
 
+- name: Remove br0 in Appliance Mode for NetworkManager
+  file:
+    dest: /etc/NetworkManager/system-connections/bridge-br0
+    state: absent
+  when: iiab_network_mode == "Appliance"
+
 - name: Stop wpa_supplicant service
   service:
     name: wpa_supplicant

roles/network/tasks/dhcpd.yml

@@ -23,6 +23,12 @@
            state=stopped
   when: is_debuntu
 
+- name: Disable stock dhcp_service ipv6
+  service: name={{ dhcp_service }}6
+           enabled=no
+           state=stopped
+  when: is_ubuntu_18
+
 - name: Install systemd unit file to /etc/systemd/system/dhcpd.service
   template: src={{ item.src }}
             dest={{ item.dest }}

roles/network/tasks/sysd-netd-debian.yml

@@ -3,21 +3,31 @@
   template:
     dest: /etc/systemd/network/IIAB-Bridge.netdev
     src: network/systemd-br0.j2
+  when: iiab_lan_iface == "br0"
 
 - name: Copy the bridge script - Assigns IP address
   template:
     dest: /etc/systemd/network/IIAB-Bridge.network
     src: network/systemd-br0-network.j2
+  when: iiab_lan_iface == "br0"
 
 - name: Copy the bridge script - Assigns br0 wired slaves
   template:
     dest: /etc/systemd/network/IIAB-Slave.network
     src: network/systemd-br0-slave.j2
-  when: iiab_wired_lan_iface is defined
+  when: iiab_wired_lan_iface is defined and iiab_lan_iface == "br0"
 
 - name: Stopping services
   include_tasks: down-debian.yml
 
+- name: Disable and mask systemd-networkd-wait-online
+  systemd:
+    name: systemd-networkd-wait-online
+    enabled: no
+    masked: yes
+    state: stopped
+  when: is_ubuntu_18
+
 - name: Reload systemd
   systemd:
     daemon_reload: yes

roles/network/templates/dhcp/dhcpd.service

@@ -1,6 +1,7 @@
 [Unit]
 Description=DHCPv4 Server Daemon
-After=rc-local.service
+After=multi-user.target
+Requires=multi-user.target
 
 [Service]
 EnvironmentFile=/etc/sysconfig/dhcpd

roles/network/templates/network/systemd-br0-network.j2

@@ -3,13 +3,9 @@
 Name=br0
 
 [Network]
-Bridge=br0
+Address={{ lan_ip }}/19
 LinkLocalAddressing=no
 DNS={{ lan_ip }}
 Domains={{ iiab_domain }}
 
-[Address]
-Address={{ lan_ip }}/19
 
-[Route]
-Gateway=""