From 47328e6ab503f0c90d1aefce6e721bdba6baed68 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Wed, 22 Nov 2017 10:21:18 -0600 Subject: [PATCH] don't use /etc/network/interfaces.d/iiab --- roles/network/defaults/main.yml | 1 + roles/network/tasks/debian.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml index ea1de51a8..59d7d238d 100644 --- a/roles/network/defaults/main.yml +++ b/roles/network/defaults/main.yml @@ -4,6 +4,7 @@ wireless_lan_present: False strict_networking: False iiab_demo_mode: False gui_static_wan: False +has_NM: False # Set defaults for discovery process as strings wifi1: "not found-1" diff --git a/roles/network/tasks/debian.yml b/roles/network/tasks/debian.yml index bb5650de4..77b3d2849 100644 --- a/roles/network/tasks/debian.yml +++ b/roles/network/tasks/debian.yml @@ -37,7 +37,7 @@ - name: Copy the bridge script template: dest=/etc/network/interfaces.d/iiab src=network/systemd.j2 - when: not is_rpi and (iiab_lan_iface == "br0" or wan_ip != "dhcp") + when: not is_rpi and not has_NM and (iiab_lan_iface == "br0" or wan_ip != "dhcp") - name: Copy the bridge script for RPi template: dest=/etc/network/interfaces.d/iiab