refactored accesspoint config

4 files changed, 26 insertions, 25 deletions

diff --git a/dan/group_vars/ele-ap.yml b/dan/group_vars/ele-ap.yml
deleted file mode 100644
index aebf2c5c..00000000
--- a/dan/group_vars/ele-ap.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
-32646532623962336365633534396432393563373333633534353364666163323033383665663031
-3937613133303538376234613435386231643265383232610a646232363232323835653562623539
-30373934366232326135613665653239376666633766333363353265393838393737373038313065
-3032656365313666330a303836366432623635376434323862393762303264353130323161616238
-63656230666134376636343239393165646465646366656231373836306461643562626331333365
-39316432653039343535636465373336303936393861323762646132356236396164363034313565
-62633966306366396237343965653335313839366466616462623533616364663731316466643533
-36623463393863316531326230663633303435373365303039653463643736653737363663313739
-35393736653737343164363530613531623162376338333636346630303030326463356433643234
-35343737393365663137303838313537633633356663623435343164636465313732646637613038
-62313136373334316233653035613064353532376133396363666565626362366164356331653335
-38316530363835313637
diff --git a/dan/group_vars/elevate-festival.yml b/dan/group_vars/elevate-festival.yml
new file mode 100644
index 00000000..65fff4ae
--- /dev/null
+++ b/dan/group_vars/elevate-festival.yml
@@ -0,0 +1,11 @@
+$ANSIBLE_VAULT;1.2;AES256;dan
+34633531626133353532363232623862353130643634316665623064373664396666666231653234
+6230353431633961333131303236376465373535323463370a346433626232373561633631666263
+65613132356563366266333733373335373062613336623032613034643934356430313538343735
+3639393666663462300a633232616430633364323932383639313832646131313135316466626638
+37373130343961393837646339653533663339313063323864383561653932623130626364343730
+65343939313565383837383731653938643362383630366162303335376239336533376130366437
+65366136366435316136333637326335313738343934343862626462323161346137396237363064
+39323038373637613764393330646363643736623165343137313036343737313364636532323666
+61373735313061313064336662353261386534306563663061656234646431393231333235633631
+3638666437343562653261623464336162666366373834353738
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