From cc445f640ed52a11f172c66098bed55e52e2a8f5 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 26 Jul 2019 12:17:19 -0400 Subject: [PATCH 1/2] Revert #1886, test for Debian 9+ --- roles/network/tasks/debian.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/network/tasks/debian.yml b/roles/network/tasks/debian.yml index 43d40af23..f3917305b 100644 --- a/roles/network/tasks/debian.yml +++ b/roles/network/tasks/debian.yml @@ -49,18 +49,18 @@ src: network/rpi.j2 when: is_rpi and iiab_lan_iface == "br0" -- name: Workaround auto issue - ifupdown compatibility mode (debian-9) +- name: Workaround auto issue - ifupdown compatibility mode (debian-9+) template: dest: /etc/network/interfaces.d/patch_auto src: network/debian-auto.j2 - when: iiab_wan_iface != "none" and is_debian_9 + when: iiab_wan_iface != "none" and is_debian and not is_debian_8 -- name: Clearing out /etc/network/interfaces for static addresses (debian-9) +- name: Clearing out /etc/network/interfaces for static addresses (debian-9+) lineinfile: state: absent path: /etc/network/interfaces regexp: "{{ iiab_wan_iface }}" - when: wan_ip != "dhcp" and iiab_wan_iface != "none" and is_debian_9 + when: wan_ip != "dhcp" and iiab_wan_iface != "none" and is_debian and not is_debian_8 - name: BIND may be affected service: From b17e268a19961bb71c656c9ab483b4916aafda2d Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 26 Jul 2019 12:24:48 -0400 Subject: [PATCH 2/2] Clarify template debian-auto.j2 for patch_auto --- roles/network/templates/network/debian-auto.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/network/templates/network/debian-auto.j2 b/roles/network/templates/network/debian-auto.j2 index 3aaa4fde6..e50779554 100644 --- a/roles/network/templates/network/debian-auto.j2 +++ b/roles/network/templates/network/debian-auto.j2 @@ -1 +1,3 @@ +# Supplied by iiab-install or iiab-network (in /opt/iiab/iiab) + auto {{ iiab_wan_iface }}