From 5ed418338f1131f90eaadc88ede4388619c7563b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 30 Jul 2021 16:30:10 -0400 Subject: [PATCH] 0-init & 1-prep: phase 1 to readable defaults/main.yml --- roles/0-init/defaults/main.yml | 24 +++++++++++++++--------- roles/1-prep/defaults/main.yml | 11 ++++++++++- vars/default_vars.yml | 2 +- vars/local_vars_big.yml | 2 +- vars/local_vars_medium.yml | 2 +- vars/local_vars_min.yml | 2 +- 6 files changed, 29 insertions(+), 14 deletions(-) diff --git a/roles/0-init/defaults/main.yml b/roles/0-init/defaults/main.yml index 16a56d688..7c2ebdc05 100644 --- a/roles/0-init/defaults/main.yml +++ b/roles/0-init/defaults/main.yml @@ -1,7 +1,13 @@ +# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml +# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! + + +# SEE ALSO /opt/iiab/iiab/roles/1-prep/defaults/main.yml + # (PRE-)release version number, for {{ iiab_env_file }} = /etc/iiab/iiab.env -# iiab_base_ver: 7.1 +# iiab_base_ver: 8.0 # iiab_revision: 0 -# ABOVE MOVED TO /opt/iiab/iiab/vars/default_vars.yml +# ABOVE 3 LINES MOVED TO /opt/iiab/iiab/vars/default_vars.yml # These entries should never be changed in this file. # These are defaults for boolean routines. @@ -11,28 +17,28 @@ # (2) roles/network/tasks/named.yml # ...after it is set in 0-init/tasks/main.yml first_run: False -rpi_model: none # 2021-07-30: Broadly used! -#xo_model: none # 2021-07-30: No longer used +rpi_model: none # 2021-07-30: Broadly used! +#xo_model: none # 2021-07-30: No longer used # 2021-07-30: Recorded to /etc/iiab/iiab.ini but not used programmatically: gw_active: False -# 2021-07-30: Used broadly, but not in an organized way -- most all IIAB +# 2021-07-30: Broadly used, but not in an organized way -- most all IIAB # outfitting/provisioning happens online -- in situations where connectivity # failures should be reported to the operator, rather than papered over: internet_available: False -discovered_wan_iface: none # 2021-07-30: Very broadly used! +discovered_wan_iface: none # 2021-07-30: Very broadly used! # 2021-07-30: Primarily for Admin Console: later change to 443 for #2811 HTTPS? gui_port: 80 -#is_F18: False # 2021-07-30: No longer used +#is_F18: False # 2021-07-30: No longer used # 2021-07-30: Barely used -- for {named, dhcpd, squid} in # roles/network/tasks/main.yml -- after being set in 0-init/tasks/network.yml FQDN_changed: False -#rtc_id: none # 2021-07-30: Moved to 1-prep/defaults/main.yml +#rtc_id: none # 2021-07-30: Moved to 1-prep/defaults/main.yml #NUC6_firmware_needed: False # 2021-07-30: Apparently never used -#wifi_id: none # 2021-07-30: Had been used in 2-common/tasks/xo.yml +#wifi_id: none # 2021-07-30: Had been used in 2-common/tasks/xo.yml # 2021-07-30: roles/network/tasks/squid.yml#L16 to stop Squid # ("when: not installing") is the only non-Fedora use of this var. diff --git a/roles/1-prep/defaults/main.yml b/roles/1-prep/defaults/main.yml index 961aaf0ea..c4a59810e 100644 --- a/roles/1-prep/defaults/main.yml +++ b/roles/1-prep/defaults/main.yml @@ -1,2 +1,11 @@ -rtc_id: none # 2021-07-30: Used in 1-prep/tasks/raspberry_pi.yml +# Real-time clock: RTC chip family. Future auto-detection plausible? + +# rtc_id: none # Or ds3231 ? Used in 1-prep/tasks/raspberry_pi.yml + +# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml +# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing! + + +# SEE ALSO /opt/iiab/iiab/roles/0-init/defaults/main.yml + #NUC6_firmware_needed: False # 2021-07-30: Apparently never used diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 3fcc88be7..c26783c58 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -48,7 +48,7 @@ default_language: en language_priority: en es fr # Real-time clock: set RTC chip family here. Future auto-detection plausible? -# rtc_id: ds3231 +rtc_id: none # Or ds3231 ? Used in 1-prep/tasks/raspberry_pi.yml # Please read more about the 'iiab-admin' Linux user, for login to IIAB's # Admin Console (http://box.lan/admin) AND to help you at the command-line: diff --git a/vars/local_vars_big.yml b/vars/local_vars_big.yml index a97ecda83..2bcaf1691 100644 --- a/vars/local_vars_big.yml +++ b/vars/local_vars_big.yml @@ -20,7 +20,7 @@ default_language: en language_priority: en es fr # Real-time clock: set RTC chip family here. Future auto-detection plausible? -# rtc_id: ds3231 +rtc_id: none # Or ds3231 ? # Please read more about the 'iiab-admin' Linux user, for login to IIAB's # Admin Console (http://box.lan/admin) AND to help you at the command-line: diff --git a/vars/local_vars_medium.yml b/vars/local_vars_medium.yml index 54bec6639..4506b6dd3 100644 --- a/vars/local_vars_medium.yml +++ b/vars/local_vars_medium.yml @@ -20,7 +20,7 @@ default_language: en language_priority: en es fr # Real-time clock: set RTC chip family here. Future auto-detection plausible? -# rtc_id: ds3231 +rtc_id: none # Or ds3231 ? # Please read more about the 'iiab-admin' Linux user, for login to IIAB's # Admin Console (http://box.lan/admin) AND to help you at the command-line: diff --git a/vars/local_vars_min.yml b/vars/local_vars_min.yml index afee5a6b3..1545386cc 100644 --- a/vars/local_vars_min.yml +++ b/vars/local_vars_min.yml @@ -20,7 +20,7 @@ default_language: en language_priority: en es fr # Real-time clock: set RTC chip family here. Future auto-detection plausible? -# rtc_id: ds3231 +rtc_id: none # Or ds3231 ? # Please read more about the 'iiab-admin' Linux user, for login to IIAB's # Admin Console (http://box.lan/admin) AND to help you at the command-line: