diff options
Diffstat (limited to 'inventory')
| -rw-r--r-- | inventory/group_vars/ele-ap/main.yml | 15 | ||||
| -rw-r--r-- | inventory/group_vars/elevate-festival/main.yml | 12 |
2 files changed, 15 insertions, 12 deletions
diff --git a/inventory/group_vars/ele-ap/main.yml b/inventory/group_vars/ele-ap/main.yml index cb271b64..ff07020d 100644 --- a/inventory/group_vars/ele-ap/main.yml +++ b/inventory/group_vars/ele-ap/main.yml @@ -18,18 +18,9 @@ accesspoint_wifi_channels: ele-ap-orpheum0: 40 accesspoint_zones: - lan: - ssid: "elevate Staff" - encryption: "psk2" - key: "{{ vault_accesspoint_zones.lan.key }}" - guest: - ssid: "elevate Public" - encryption: "psk2" - key: "{{ vault_accesspoint_zones.guest.key }}" - infoscreens: - ssid: "elevate Infoscreens" - encryption: "psk2" - key: "{{ vault_accesspoint_zones.infoscreens.key }}" + lan: "{{ network_zones.lan.wifi }}" + guest: "{{ network_zones.guest.wifi }}" + infoscreens: "{{ network_zones.infoscreens.wifi }}" accesspoint_network_zones: "{{ accesspoint_network_zones_yaml | from_yaml }}" diff --git a/inventory/group_vars/elevate-festival/main.yml b/inventory/group_vars/elevate-festival/main.yml index 2f12dfda..ad203055 100644 --- a/inventory/group_vars/elevate-festival/main.yml +++ b/inventory/group_vars/elevate-festival/main.yml @@ -13,6 +13,10 @@ network_zones: ele-media: 200 ele-telesto: 201 ele-thetys: 202 + wifi: + ssid: "elevate Staff" + encryption: "psk2" + key: "{{ vault_wifi_keys.lan }}" guest: vlan: 23 @@ -24,6 +28,10 @@ network_zones: start: 1 limit: 250 leasetime: 2h + wifi: + ssid: "elevate Public" + encryption: "psk2" + key: "{{ vault_wifi_keys.guest }}" mgmt: vlan: 42 @@ -70,6 +78,10 @@ network_zones: dhcp: start: 100 limit: 199 + wifi: + ssid: "elevate Infoscreens" + encryption: "psk2" + key: "{{ vault_wifi_keys.infoscreens }}" ccinet: vlan: 128 |