diff options
author | Christian Pointner <equinox@spreadspace.org> | 2022-11-21 00:30:08 +0100 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2022-11-21 00:30:08 +0100 |
commit | fa5c726f9f39d834962f5157628bddfe85e026b6 (patch) | |
tree | 06ea51c17ff548cd6cf2188d481a8df914e4242c /inventory/group_vars | |
parent | Merge branch 'topic/wireguard-extern-vpn' (diff) |
some more cleanups and fixes
Diffstat (limited to 'inventory/group_vars')
-rw-r--r-- | inventory/group_vars/chaos-at-home-switches/vars.yml | 2 | ||||
-rw-r--r-- | inventory/group_vars/vmhost-ch-prometheus/vars.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/inventory/group_vars/chaos-at-home-switches/vars.yml b/inventory/group_vars/chaos-at-home-switches/vars.yml index fb72c9b1..2b5bc625 100644 --- a/inventory/group_vars/chaos-at-home-switches/vars.yml +++ b/inventory/group_vars/chaos-at-home-switches/vars.yml @@ -5,8 +5,10 @@ switch_mgmt_interface: "Gi1/0/28" switch_vlans: "{{ switch_vlans_yaml | from_yaml }}" switch_vlans_yaml: | {% for zone_name in network_zones.keys() %} + {% if 'vlan' in network_zones[zone_name] %} - name: "{{ zone_name }}" id: "{{ network_zones[zone_name].vlan }}" + {% endif %} {% endfor %} switch_interfaces: "{{ switch_interfaces_yaml | from_yaml }}" diff --git a/inventory/group_vars/vmhost-ch-prometheus/vars.yml b/inventory/group_vars/vmhost-ch-prometheus/vars.yml index 888c0bcf..ac5e3b6e 100644 --- a/inventory/group_vars/vmhost-ch-prometheus/vars.yml +++ b/inventory/group_vars/vmhost-ch-prometheus/vars.yml @@ -1,6 +1,6 @@ --- __vmhost_bridge_interface_zones__: - bond0: "{{ network_zones | list | difference(['lan']) }}" + bond0: "{{ network_zones | dict2items | selectattr('value.vlan', 'defined') | map(attribute='key') | difference(['lan']) }}" __vmhost_bridge_interface_zones_yaml__: | {% for interface in (__vmhost_bridge_interface_zones__.keys() | sort) %} |