external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #511 from holta/master

Browse source 
ansible output typos/edits in network/tasks/debian.yml & network/tasks/detected_network.yml
This commit is contained in:
A Holt 2017-11-10 11:45:13 -05:00 • committed by GitHub
commit cd21cbe17d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
roles/network/tasks/debian.yml
View file

@ -57,19 +57,19 @@
service: name=dnsmasq state=stopped service: name=dnsmasq state=stopped
when: dnsmasq_install when: dnsmasq_install
- name: reload systemd - name: Reload systemd
shell: systemctl daemon-reload shell: systemctl daemon-reload
# now pick up denyinterfaces # now pick up denyinterfaces
- name: restart dhcpcd - name: Restart dhcpcd
service: name=dhcpcd state=restarted service: name=dhcpcd state=restarted
when: dhcpcd_result == "enabled" when: dhcpcd_result == "enabled"
- name: restart the networking service - name: Restart the networking service
service: name=networking state=restarted service: name=networking state=restarted
when: not nobridge is defined and not no_net_restart 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 service: name=hostapd state=restarted
when: iiab_wireless_lan_iface is defined and hostapd_enabled and iiab_network_mode != "Appliance" when: iiab_wireless_lan_iface is defined and hostapd_enabled and iiab_network_mode != "Appliance"

14
roles/network/tasks/detected_network.yml
View file

@ -15,25 +15,25 @@
device_gw: "{{ discovered_wan_iface }}" device_gw: "{{ discovered_wan_iface }}"
when: ansible_default_ipv4.gateway is defined when: ansible_default_ipv4.gateway is defined
- name: RedHat network detection - name: Red Hat network detection (redhat)
include_tasks: detected_redhat.yml include_tasks: detected_redhat.yml
when: is_redhat 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 shell: systemctl is-enabled dhcpcd
register: dhcpcd_test register: dhcpcd_test
ignore_errors: True ignore_errors: True
- name: setting dhcpcd_test results - name: Setting dhcpcd_test results
set_fact: set_fact:
dhcpcd_result: "{{ dhcpcd_test.stdout }}" 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 shell: grep {{ device_gw }} /etc/network/interfaces | wc -l
when: is_debuntu when: is_debuntu
register: wan_file register: wan_file
- name: setting wan_in_interfaces - name: Setting wan_in_interfaces
set_fact: set_fact:
wan_in_interfaces: True wan_in_interfaces: True
when: is_debuntu and wan_file.stdout|int >= 0 when: is_debuntu and wan_file.stdout|int >= 0
@ -105,7 +105,7 @@
ignore_errors: True ignore_errors: True
changed_when: false changed_when: false
- name: Calulate number of LAN interfaces including WiFi - name: Calculate number of LAN interfaces including WiFi
set_fact: set_fact:
num_lan_interfaces: "{{ num_lan_interfaces_result.stdout|int }}" num_lan_interfaces: "{{ num_lan_interfaces_result.stdout|int }}"
@ -166,7 +166,7 @@
iiab_lan_iface: "{{ iiab_wireless_lan_iface }}" iiab_lan_iface: "{{ iiab_wireless_lan_iface }}"
when: iiab_wireless_lan_iface is defined and nobridge is defined 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: set_fact:
iiab_lan_iface: none iiab_lan_iface: none
no_net_restart: True no_net_restart: True