1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00

computed_vars cleaning

This commit is contained in:
Jerry Vonau 2017-10-31 11:10:33 -04:00
parent 534bd253f4
commit 16102e0da6

View file

@ -15,38 +15,6 @@
exFAT_enabled: True exFAT_enabled: True
when: xo_model != "none" when: xo_model != "none"
# Discover do we have a gateway? -- if ansible detects gateway, becomes WAN candidate
- name: Finding gateway
set_fact:
discovered_wan_iface: "{{ ansible_default_ipv4.alias }}"
when: 'ansible_default_ipv4.gateway is defined'
- name: Verify gateway present
shell: ping -c4 "{{ ansible_default_ipv4.gateway }}" &> /dev/null ; echo $?
when: discovered_wan_iface != "none"
register: gw_active_test
- name: Recording gateway response
set_fact:
gw_active: True
when: discovered_wan_iface != "none" and gw_active_test.stdout == "0"
- name: Test for internet access
get_url: url="{{ iiab_download_url }}/heart-beat.txt" dest=/tmp/heart-beat.txt
ignore_errors: True
# async: 10
# poll: 2
register: internet_access_test
- name: Set internet_available true if wget succeeded
set_fact:
internet_available: True
when: not internet_access_test|failed and not disregard_network
- name: Cleanup internet test file
file: path=/tmp/heart-beat.txt
state=absent
- name: set FQDN - name: set FQDN
set_fact: set_fact:
iiab_fqdn: "{{ iiab_hostname }}.{{ iiab_domain }}" iiab_fqdn: "{{ iiab_hostname }}.{{ iiab_domain }}"
@ -57,25 +25,26 @@
FQDN_changed: True FQDN_changed: True
when: iiab_fqdn != ansible_fqdn when: iiab_fqdn != ansible_fqdn
# Now check FQDN - name: Now check FQDN
- include: roles/2-common/tasks/hostname.yml include_tasks: roles/2-common/tasks/hostname.yml
when: not first_run and FQDN_changed when: FQDN_changed
# Discover do we have a gateway? -- if ansible detects gateway, becomes WAN candidate # Discover do we have a gateway? -- if ansible detects gateway, becomes WAN candidate
- name: Finding gateway - name: Finding gateway
set_fact: set_fact:
discovered_wan_iface: "{{ ansible_default_ipv4.alias }}" discovered_wan_iface: "{{ ansible_default_ipv4.alias }}"
when: 'ansible_default_ipv4.gateway is defined' iiab_wan_iface: "{{ discovered_wan_iface }}"
when: ansible_default_ipv4.gateway is defined
- name: Verify gateway present - name: Verify gateway present
shell: ping -c4 "{{ ansible_default_ipv4.gateway }}" &> /dev/null ; echo $? shell: ping -c4 "{{ ansible_default_ipv4.gateway }}" | grep icmp_seq=4 | wc -l
when: discovered_wan_iface != "none" when: discovered_wan_iface != "none"
register: gw_active_test register: gw_active_test
- name: Recording gateway response - name: Recording gateway response
set_fact: set_fact:
gw_active: True gw_active: True
when: discovered_wan_iface != "none" and gw_active_test.stdout == "0" when: discovered_wan_iface != "none" and gw_active_test.stdout == "1"
- name: Test for internet access - name: Test for internet access
get_url: url="{{ iiab_download_url }}/heart-beat.txt" dest=/tmp/heart-beat.txt get_url: url="{{ iiab_download_url }}/heart-beat.txt" dest=/tmp/heart-beat.txt