From 340f4254565a2a982eceac9d14a7eb4b4a22b9bb Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 10 Nov 2017 11:33:19 -0500 Subject: [PATCH 1/2] roles/network/tasks/debian.yml output tweaks --- 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 889c10dde..bb5650de4 100644 --- a/roles/network/tasks/debian.yml +++ b/roles/network/tasks/debian.yml @@ -57,19 +57,19 @@ service: name=dnsmasq state=stopped when: dnsmasq_install -- name: reload systemd +- name: Reload systemd shell: systemctl daemon-reload # now pick up denyinterfaces -- name: restart dhcpcd +- name: Restart dhcpcd service: name=dhcpcd state=restarted when: dhcpcd_result == "enabled" -- name: restart the networking service +- name: Restart the networking service service: name=networking state=restarted when: not nobridge is defined and not no_net_restart -- name: restart hostapd when wifi is present +- name: Restart hostapd when WiFi is present service: name=hostapd state=restarted when: iiab_wireless_lan_iface is defined and hostapd_enabled and iiab_network_mode != "Appliance" From 2a1b18d8ad20cf7a4eab82d87f043b12fb0e3502 Mon Sep 17 00:00:00 2001 From: A Holt Date: Fri, 10 Nov 2017 11:39:20 -0500 Subject: [PATCH 2/2] typos/tweaks in detected_network.yml --- roles/network/tasks/detected_network.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml index 29b0bd73d..2bc744d07 100644 --- a/roles/network/tasks/detected_network.yml +++ b/roles/network/tasks/detected_network.yml @@ -15,25 +15,25 @@ device_gw: "{{ discovered_wan_iface }}" when: ansible_default_ipv4.gateway is defined -- name: RedHat network detection +- name: Red Hat network detection (redhat) include_tasks: detected_redhat.yml when: is_redhat -- name: check to see if dhcpcd is installed and active - Can Fail +- name: Check to see if dhcpcd is installed and active - Can Fail shell: systemctl is-enabled dhcpcd register: dhcpcd_test ignore_errors: True -- name: setting dhcpcd_test results +- name: Setting dhcpcd_test results set_fact: dhcpcd_result: "{{ dhcpcd_test.stdout }}" -- name: check /etc/network/interfaces for gateway +- name: Check /etc/network/interfaces for gateway shell: grep {{ device_gw }} /etc/network/interfaces | wc -l when: is_debuntu register: wan_file -- name: setting wan_in_interfaces +- name: Setting wan_in_interfaces set_fact: wan_in_interfaces: True when: is_debuntu and wan_file.stdout|int >= 0 @@ -105,7 +105,7 @@ ignore_errors: True changed_when: false -- name: Calulate number of LAN interfaces including WiFi +- name: Calculate number of LAN interfaces including WiFi set_fact: num_lan_interfaces: "{{ num_lan_interfaces_result.stdout|int }}" @@ -166,7 +166,7 @@ iiab_lan_iface: "{{ iiab_wireless_lan_iface }}" when: iiab_wireless_lan_iface is defined and nobridge is defined -- name: in VM disable LAN - needs local_vars entry to activate +- name: In VM disable LAN - needs local_vars entry to activate set_fact: iiab_lan_iface: none no_net_restart: True