From 039b584fb2251a5c9f9eb2555e519dd5049bb21e Mon Sep 17 00:00:00 2001
From: Jerry Vonau <jvonau3@gmail.com>
Date: Wed, 2 May 2018 18:39:53 -0500
Subject: [PATCH] systemd-networkd fix-ups

---
 roles/network/tasks/sysd-netd-debian.yml               | 4 +++-
 roles/network/templates/network/systemd-br0-network.j2 | 6 +-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml
index 08e09f1bc..8019d9872 100644
--- a/roles/network/tasks/sysd-netd-debian.yml
+++ b/roles/network/tasks/sysd-netd-debian.yml
@@ -3,17 +3,19 @@
   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
diff --git a/roles/network/templates/network/systemd-br0-network.j2 b/roles/network/templates/network/systemd-br0-network.j2
index c524a50a7..53e99fdd7 100644
--- a/roles/network/templates/network/systemd-br0-network.j2
+++ b/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=""