Inventory group/host variables: Sort yaml

This was done using yq (
https://mikefarah.gitbook.io/yq/operators/sort-keys )

Doing things this way makes it much easier to see if a variable is set
in a file or if two hosts differ in what variables they set. Hopefully
we can keep things sorted moving forward.

Basically this means just sort a-z anything you add to any host or group
vaiable and it will be in the right place.

Additionally, this enforces 'normal' intent rules for all the variable
files which we should also try and obey. 2 spaces for first level, 3 for
next, etc. When in doubt you can run yq on it.

This should cause NO actual vairable changes, it's all just readability
fixing for humans, ansible parses it exactly the same.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2021-11-16 13:27:57 -08:00
parent f6f29ded92
commit 580cd252c5
769 changed files with 12115 additions and 15787 deletions

View file

@ -1,4 +1,16 @@
---
datacenter: iad2
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
em1_ipv4: 10.3.174.24
em1_ipv4_gw: 10.3.174.254
em1_ipv4_nm: 24
em1_mac: "{{ mac1 }}"
em2_mac: "{{ mac2 }}"
em3_mac: "{{ mac3 }}"
em4_mac: "{{ mac4 }}"
freezes: false
# em1 is default network
# em2 is disabled/nothing
@ -7,78 +19,52 @@ freezes: false
# NOTE network configuration beyond the scope of linux-system-roles on
# this host is performed by the openqa/worker role
datacenter: iad2
has_ipv4: yes
mac1: e4:43:4b:24:10:aa
mac2: e4:43:4b:24:10:ca
mac3: e4:43:4b:24:10:ac
mac4: e4:43:4b:24:10:cb
dns1: 10.3.163.33
dns2: 10.3.163.34
dns_search1: "iad2.fedoraproject.org"
dns_search2: "fedoraproject.org"
has_ipv4: yes
em1_ipv4: 10.3.174.24
em1_ipv4_nm: 24
em1_ipv4_gw: 10.3.174.254
em1_mac: "{{ mac1 }}"
em2_mac: "{{ mac2 }}"
em3_mac: "{{ mac3 }}"
em4_mac: "{{ mac4 }}"
network_connections:
- name: em1
mac: "{{ em1_mac }}"
state: up
type: ethernet
autoconnect: yes
ip:
address:
- "{{ em1_ipv4 }}/{{ em1_ipv4_nm }}"
gateway4: "{{ em1_ipv4_gw }}"
dns:
- "{{ dns1 }}"
- "{{ dns2 }}"
dns_search:
- "{{ dns_search1 }}"
- "{{ dns_search2 }}"
dhcp4: no
auto6: no
- name: em2
mac: "{{ em2_mac }}"
state: down
type: ethernet
autoconnect: no
- name: em3
mac: "{{ em3_mac }}"
state: down
type: ethernet
autoconnect: no
- name: em4
mac: "{{ em4_mac }}"
state: down
type: ethernet
autoconnect: no
nrpe_procs_warn: 1400
- autoconnect: yes
ip:
address:
- "{{ em1_ipv4 }}/{{ em1_ipv4_nm }}"
auto6: no
dhcp4: no
dns:
- "{{ dns1 }}"
- "{{ dns2 }}"
dns_search:
- "{{ dns_search1 }}"
- "{{ dns_search2 }}"
gateway4: "{{ em1_ipv4_gw }}"
mac: "{{ em1_mac }}"
name: em1
state: up
type: ethernet
- autoconnect: no
mac: "{{ em2_mac }}"
name: em2
state: down
type: ethernet
- autoconnect: no
mac: "{{ em3_mac }}"
name: em3
state: down
type: ethernet
- autoconnect: no
mac: "{{ em4_mac }}"
name: em4
state: down
type: ethernet
nrpe_procs_crit: 1600
sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
openqa_tap_iface: em1
nrpe_procs_warn: 1400
# Has a hardware RNG
openqa_rngd: true
openqa_tap_iface: em1
# this is a powerful machine, can handle more openQA workers
openqa_workers: 20
sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
# firewall ports for server->worker websockets connections
# this port is 'QEMUPORT plus 1'
# QEMUPORT is: