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

0-init/defaults/main.yml: reconcile stale vars

Browse source
This commit is contained in:
root 2021-07-30 15:37:04 -04:00
parent e33d2ad632
commit 82a636ced5
6 changed files with 51 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

11
scripts/local_facts.fact
View file

@ -3,7 +3,7 @@
# Higher-level purpose explained at the bottom of:
# https://github.com/iiab/iiab/blob/master/vars/default_vars.yml
# 2020-10-27: Most of the 11 variables require a command[*] to be run to
# 2020-10-27: Most of the 10 variables require a command[*] to be run to
# establish the var's value. WE DISPLAY ALL ERRORS / DIAGNOSTICS AND CONTINUE.
#
# [*] DOESN'T MATTER WHAT COMMAND: so long as it fails with Return Code != 0
@ -14,7 +14,7 @@ OS="none"
VERSION_ID="none" # This var's combined with the above, before being output
IIAB_BRANCH="none"
IIAB_COMMIT="none"
XO_MODEL="none"
#XO_MODEL="none"
RPI_MODEL="none"
ANSIBLE_VERSION="none"
DHCPCD="none" # The last 3 conditioned on string output not RC. SEE BELOW.
@ -87,8 +87,8 @@ tmp=$(git rev-parse --abbrev-ref HEAD) &&
tmp=$(git rev-parse --verify HEAD) &&
IIAB_COMMIT=$tmp
tmp=$(cat /proc/device-tree/mfg-data/MN) &&
XO_MODEL=$tmp
#tmp=$(cat /proc/device-tree/mfg-data/MN) &&
# XO_MODEL=$tmp
tmp=$(cat /proc/device-tree/model) &&
RPI_MODEL=$tmp
@ -128,9 +128,10 @@ cat <<EOF
"systemd_networkd" : "$SYSTEMD_NETWORKD",
"iiab_branch" : "$IIAB_BRANCH",
"iiab_commit" : "$IIAB_COMMIT",
"xo_model" : "$XO_MODEL",
"rpi_model" : "$RPI_MODEL",
"ansible_version" : "$ANSIBLE_VERSION",
"os" : "$OS",
"os_ver" : "$OS_VER"}
EOF
#"xo_model" : "$XO_MODEL",