host and group now also vor bridge_vlan

imp1sh · Jul 13, 2022 · a6ce3a9 · a6ce3a9
1 parent adb1686
commit a6ce3a9
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/roles/ansible_openwrtnetwork/tasks/merge.yml b/roles/ansible_openwrtnetwork/tasks/merge.yml
@@ -14,3 +14,11 @@
 - name: combine all devices into openwrt_network_devices
   set_fact:
     openwrt_network_devices: "{{ openwrt_network_deviceshost | default({}) | combine(openwrt_network_devicesmergedgroup | default({}) ) }}"
+# Merge VLAN Devices
+- name: merge bridge vlans
+  set_fact:
+    openwrt_network_bridge_vlanmergedgroup: "{{ openwrt_network_bridge_vlangroup.keys() | list | intersect(group_names) | map('extract', openwrt_network_bridge_vlangroup) | combine }}"
+  when: openwrt_network_bridge_vlangroup is defined
+- name: combine all bridge_vlan into openwrt_network_bridge_vlan
+  set_fact:
+    openwrt_network_bridge_vlan: "{{ openwrt_network_bridge_vlanhost | default({}) | combine(openwrt_network_bridge_vlanmergedgroup | default({}) ) }}"