From f33e15ecd2eb5adacf3770ab1dd48dad24d6804f Mon Sep 17 00:00:00 2001 From: root Date: Fri, 22 Jul 2022 11:25:47 -0400 Subject: [PATCH] network/tasks/restart.yml also needed netplan var. Dup code for now :/ --- roles/network/tasks/detected_network.yml | 2 +- roles/network/tasks/main.yml | 2 ++ roles/network/tasks/netplan.yml | 2 +- roles/network/tasks/restart.yml | 8 ++++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml index 9acffaab6..8a5dd3a5d 100644 --- a/roles/network/tasks/detected_network.yml +++ b/roles/network/tasks/detected_network.yml @@ -36,7 +36,7 @@ device_gw: "{{ discovered_wan_iface }}" when: ansible_default_ipv4.gateway is defined -# 2022-07-22: Moved to netplan.yml +# 2022-07-22: Moved to netplan.yml AND restart.yml (REMOVE DUPLICATE CODE LATER?!) # - name: Figure out netplan file name # shell: ls /etc/netplan # register: netplan diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml index efea4cf3f..5a000f13b 100644 --- a/roles/network/tasks/main.yml +++ b/roles/network/tasks/main.yml @@ -43,6 +43,7 @@ # group: root # mode: 0755 + - name: Configuring Network if enabled block: @@ -101,6 +102,7 @@ # end block when: network_installed is defined and network_enabled + - name: Create {{ iiab_etc_path }}/install-flags/iiab-network-complete on second pass of network role. file: path: "{{ iiab_etc_path }}/install-flags/iiab-network-complete" diff --git a/roles/network/tasks/netplan.yml b/roles/network/tasks/netplan.yml index 2e685be3e..8a772d214 100644 --- a/roles/network/tasks/netplan.yml +++ b/roles/network/tasks/netplan.yml @@ -1,4 +1,4 @@ -# 2022-07-22: Moved from detected_network.yml +# 2022-07-22: Moved from detected_network.yml to netplan.yml AND restart.yml (REMOVE DUPLICATE CODE LATER?!) - name: Figure out netplan file name shell: ls /etc/netplan register: netplan diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml index de930332f..e5a825dee 100644 --- a/roles/network/tasks/restart.yml +++ b/roles/network/tasks/restart.yml @@ -1,3 +1,11 @@ +# 2022-07-22: Moved from detected_network.yml to netplan.yml AND restart.yml (REMOVE DUPLICATE CODE LATER?!) +- name: Figure out netplan file name + shell: ls /etc/netplan + register: netplan + #ignore_errors: True # pre 17.10 doesn't use netplan + when: is_ubuntu + + - name: Restart wpa_supplicant service systemd: name: "{{ item }}"