From 4ed7c38f4f25391aa2842f6c620db5c04f7ae03a Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 1 May 2018 14:40:04 -0500 Subject: [PATCH 1/2] NM not playing nice on ubuntu-16, use older method --- roles/network/tasks/main.yml | 4 ++-- vars/default_vars.yml | 1 + vars/ubuntu-16.yml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index f1adc8d92..6e73f7d4c 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -106,7 +106,7 @@ - name: NetworkManager in use include_tasks: NM-debian.yml - when: is_debuntu and network_manager_active + when: is_ubuntu_18 and network_manager_active #and not installing tags: - network @@ -127,7 +127,7 @@ - name: Not RPi, Not NetworkManager, Not systemd-networkd in use include_tasks: debian.yml - when: not is_rpi and not network_manager_active and not systemd_networkd_active and is_debuntu + when: (not is_rpi and not network_manager_active and not systemd_networkd_active and is_debuntu) or is_ubuntu_16 #and not installing tags: - network diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 1632d1f80..2c6a94a62 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -383,6 +383,7 @@ xovis_chart_heading: "My School: Usage Data Visualization" # wide to narrow is_debuntu: False is_ubuntu: False +is_ubuntu_16: False is_ubuntu_18: False is_debian: False is_debian_9: False diff --git a/vars/ubuntu-16.yml b/vars/ubuntu-16.yml index 013e385a2..741e3b012 100644 --- a/vars/ubuntu-16.yml +++ b/vars/ubuntu-16.yml @@ -1,5 +1,6 @@ is_debuntu: True is_ubuntu: True +is_ubuntu_16: True dns_service: bind9 dns_user: bind dhcp_service: isc-dhcp-server From 748235c4b767b99edb1ed9bb65ff6273d7a1ab31 Mon Sep 17 00:00:00 2001 From: Jerry Vonau Date: Tue, 1 May 2018 15:55:05 -0500 Subject: [PATCH 2/2] start hostapd before dhcpd --- roles/network/templates/dhcp/dhcpd.service | 2 +- roles/network/templates/hostapd/hostapd.service.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/network/templates/dhcp/dhcpd.service b/roles/network/templates/dhcp/dhcpd.service index 5313bfa7e..7dff71264 100644 --- a/roles/network/templates/dhcp/dhcpd.service +++ b/roles/network/templates/dhcp/dhcpd.service @@ -1,6 +1,6 @@ [Unit] Description=DHCPv4 Server Daemon -After=network-online.target +After=rc-local.service [Service] EnvironmentFile=/etc/sysconfig/dhcpd diff --git a/roles/network/templates/hostapd/hostapd.service.j2 b/roles/network/templates/hostapd/hostapd.service.j2 index 0a7b9c22d..09d3862b0 100644 --- a/roles/network/templates/hostapd/hostapd.service.j2 +++ b/roles/network/templates/hostapd/hostapd.service.j2 @@ -1,6 +1,6 @@ [Unit] Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator -After=rc-local.service +After=network-online.target [Service] Type=idle