diff --git a/roles/network/tasks/debian.yml b/roles/network/tasks/debian.yml index 55a538712..8be1ec8f6 100644 --- a/roles/network/tasks/debian.yml +++ b/roles/network/tasks/debian.yml @@ -9,16 +9,16 @@ # 4. In lan_controller: wan is off, eth0 and wlan0 under br0 # 5. In gateway: eth0 is wan, and wlan0 is under br0 (only one adapter under br0) # 6. As a slight concess to auto config, if eth1 exists, make it wan, and force gateway + +#- name: In upgrade from earlier IIAB 6.2, delete the resolvconf +# package: name=resolvconf +# state=absent +# enabled=False +# ignore_errors: True -- name: In upgrade from earlier IIAB 6.2, delete the resolvconf - package: name=resolvconf - state=absent - enabled=False - ignore_errors: True - -- name: Get the dhcp client daemon used in recent Raspbian - package: name=dhcpcd5 - state=present +#- name: Get the dhcp client daemon used in recent raspbian +# package: name=dhcpcd5 +# state=present - name: For upgrades from earlier IIAB 6.2, remove br0 file file: path=/etc/network/interfaces.d/br0 @@ -41,7 +41,7 @@ - name: Copy the bridge script template: dest=/etc/network/interfaces.d/iiab - src=network/iiab.j2 + src=network/systemd.j2 register: interface when: iiab_lan_iface == "br0" or wan_ip != "dhcp" diff --git a/roles/network/tasks/rpi_debian.yml b/roles/network/tasks/rpi_debian.yml index 3aa7b7441..2f4219aff 100644 --- a/roles/network/tasks/rpi_debian.yml +++ b/roles/network/tasks/rpi_debian.yml @@ -39,7 +39,7 @@ - name: Copy the network config script template: dest=/etc/network/interfaces.d/iiab - src=network/iiab.j2 + src=network/systemd.j2 register: interface when: iiab_lan_iface == "br0" or wan_ip != "dhcp" diff --git a/roles/network/templates/network/interfaces.j2 b/roles/network/templates/network/systemd.j2 similarity index 100% rename from roles/network/templates/network/interfaces.j2 rename to roles/network/templates/network/systemd.j2