mirror of
https://github.com/iiab/iiab.git
synced 2025-02-15 04:32:11 +00:00
get rid of the stall with 'dhcp'
This commit is contained in:
parent
aad974777a
commit
ff7022b563
3 changed files with 8 additions and 2 deletions
|
@ -4,6 +4,7 @@ wireless_lan_present: False
|
||||||
strict_networking: False
|
strict_networking: False
|
||||||
iiab_demo_mode: False
|
iiab_demo_mode: False
|
||||||
gui_static_wan: False
|
gui_static_wan: False
|
||||||
|
wan_cidr:
|
||||||
|
|
||||||
# Set defaults for discovery process as strings
|
# Set defaults for discovery process as strings
|
||||||
wifi1: "not found-1"
|
wifi1: "not found-1"
|
||||||
|
|
|
@ -31,7 +31,12 @@
|
||||||
- name: Static IP computing CIDR
|
- name: Static IP computing CIDR
|
||||||
shell: netmask {{ wan_ip }}/{{ wan_netmask }} | awk -F "/" '{print $2}'
|
shell: netmask {{ wan_ip }}/{{ wan_netmask }} | awk -F "/" '{print $2}'
|
||||||
register: CIDR
|
register: CIDR
|
||||||
when: wan_ip != "dhcp" or gui_static_wan_ip == "undefined"
|
when: wan_ip != "dhcp"
|
||||||
|
|
||||||
|
- name: Static IP setting CIDR
|
||||||
|
set_fact:
|
||||||
|
wan_cidr: "{{ CIDR.stdout }}"
|
||||||
|
when: wan_ip != "dhcp"
|
||||||
|
|
||||||
# ICO will always set gui_static_wan_ip away from the default of 'unset' while
|
# ICO will always set gui_static_wan_ip away from the default of 'unset' while
|
||||||
# gui_static_wan turns dhcp on/off through wan_ip in computed_network and
|
# gui_static_wan turns dhcp on/off through wan_ip in computed_network and
|
||||||
|
|
|
@ -4,7 +4,7 @@ network:
|
||||||
{{ iiab_wan_iface }}:
|
{{ iiab_wan_iface }}:
|
||||||
dhcp4: false
|
dhcp4: false
|
||||||
dhcp6: false
|
dhcp6: false
|
||||||
addresses: [{{ wan_ip }}/{{ CIDR.stdout }}]
|
addresses: [{{ wan_ip }}/{{ wan_cidr }}]
|
||||||
gateway4: {{ wan_gateway }}
|
gateway4: {{ wan_gateway }}
|
||||||
nameservers:
|
nameservers:
|
||||||
addresses: [{{ wan_nameserver }}]
|
addresses: [{{ wan_nameserver }}]
|
||||||
|
|
Loading…
Reference in a new issue