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 #2672 from holta/initialize-vars-meaningfully

Browse source 
Initialize vars more meaningfully, for #2669 and #2670, thx to ansible-base 2.10.5's more strict checking [roles/network/defaults/main.yml]
This commit is contained in:
A Holt 2021-01-29 16:53:27 -05:00 • committed by GitHub
commit 62867782fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
roles/0-init/tasks/validate_vars.yml
View file

@ -36,6 +36,11 @@
# 2020-07-08 - Excellent analysis & summary by Jon Spriggs: "In Ansible, # 2020-07-08 - Excellent analysis & summary by Jon Spriggs: "In Ansible,
# determine the type of a value, and casting those values to other types" # determine the type of a value, and casting those values to other types"
# https://jon.sprig.gs/blog/post/1801 # https://jon.sprig.gs/blog/post/1801
#
# 2021-01-29 - ansible-base 2.10.5 (1) is more strict about empty string vars
# (2) no longer supports "when: myvar is boolean", "is integer" & "is float"
# (3) brings yet more "Ansible Collections" dependency changes (undocumented!)
# Details: https://github.com/iiab/iiab/pull/2672 (see also #2669)
# 3. "How do i fail a task in Ansible if the variable contains a boolean value? # 3. "How do i fail a task in Ansible if the variable contains a boolean value?
# I want to perform input validation for Ansible playbooks" # I want to perform input validation for Ansible playbooks"

38
roles/network/defaults/main.yml
View file

@ -17,7 +17,7 @@
# Wi-Fi - IF NECESSARY, CUSTOMIZE THESE 6 VARIABLES IN /etc/iiab/local_vars.yml # Wi-Fi - IF NECESSARY, CUSTOMIZE THESE 6 VARIABLES IN /etc/iiab/local_vars.yml
# host_country_code: US # host_country_code: US
# host_ssid: "Internet in a Box" # host_ssid: Internet in a Box
# host_wifi_mode: g # host_wifi_mode: g
# host_channel: 6 # host_channel: 6
# hostapd_secure: False # hostapd_secure: False
@ -53,28 +53,28 @@ 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: wan_cidr: ""
virtual_network_devices: "-e ap0 -e lo -e br0 -e tun -e br- -e docker -e bridge0 -e veth" virtual_network_devices: "-e ap0 -e lo -e br0 -e tun -e br- -e docker -e bridge0 -e veth"
# Set defaults for discovery process as strings # Set defaults for discovery process as strings
wifi1: "not found-1" wifi1: "not found-1"
wifi2: "not found-2" wifi2: "not found-2"
exclude_devices: "none" exclude_devices: none
device_gw: "none" device_gw: none
prior_gw_device: "" prior_gw_device: unset
iiab_wan_iface: "none" iiab_wan_iface: none
iiab_lan_iface: "none" iiab_lan_iface: none
discovered_lan_iface: "none" discovered_lan_iface: none
discovered_wired_iface: "none" discovered_wired_iface: none
discovered_wireless_iface: "none" discovered_wireless_iface: none
# Red Hat # Red Hat
#iiab_wired_lan_iface: "none" #iiab_wired_lan_iface: "none"
#iiab_wireless_lan_iface: "none" #iiab_wireless_lan_iface: "none"
has_WAN: False has_WAN: False
has_ifcfg_gw: "none" has_ifcfg_gw: none
has_wifi_gw: "none" has_wifi_gw: none
# Debian # Debian
dhcpcd_result: "" dhcpcd_result: ""
@ -83,10 +83,10 @@ network_manager_active: False
systemd_networkd_active: False systemd_networkd_active: False
# The values here are default local variables # The values here are default local variables
gui_wan_iface: "unset" gui_wan_iface: unset
gui_static_wan_ip: "unset" gui_static_wan_ip: unset
wondershaper_dspeed: "4096" wondershaper_dspeed: 4096
wondershaper_upspeed: "1024" wondershaper_upspeed: 1024
# netplan # netplan
fix_dispatcher: True fix_dispatcher: True
@ -105,7 +105,7 @@ fix_dispatcher: True
# Above 2 vars set in /etc/iiab/local_vars.yml # Above 2 vars set in /etc/iiab/local_vars.yml
# captive_portal_port: "9090" # captive_portal_port: "9090"
# Above var set in /opt/iiab/iiab/vars/default_vars.yml # Above var set in /opt/iiab/iiab/vars/default_vars.yml
py_captive_portal_port: "9090" py_captive_portal_port: 9090
py_captive_portal_username: "Admin" py_captive_portal_username: Admin
py_captive_portal_password: "changeme" py_captive_portal_password: changeme
# In a pinch, disable it by running: systemctl disable captive-portal # In a pinch, disable it by running: systemctl disable captive-portal