From 6591dfa7a6804e9f5989c288340dc80af486f712 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 4 Jul 2022 01:55:48 +0200 Subject: elevate-festival: refactor numbering of vlans --- inventory/group_vars/elevate-festival/vars.yml | 54 +++++++++++++++++++------- 1 file changed, 39 insertions(+), 15 deletions(-) (limited to 'inventory/group_vars') diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml index 44011ed7..7dd7fc7f 100644 --- a/inventory/group_vars/elevate-festival/vars.yml +++ b/inventory/group_vars/elevate-festival/vars.yml @@ -213,21 +213,12 @@ network_zones: vlan: 250 prefix: 192.168.250.0/24 - ccinet: - description: "citycom upstream for general internet access (Fiber)" + forum_a1: + description: "A1 upstream for general internet access (DSL)" vlan: 500 - prefix: 85.237.2.96/28 - gateway: 85.237.2.97 - dns: - - 217.29.144.65 - - 217.29.144.66 - offsets: - ## citycom uses offset 1,2 and 3 - ele-router: 4 # 85.237.2.100 - ele-media: 5 # 85.237.2.101 - ccemc: - description: "citycom upstream for streams-only (Fiber)" + cc_forum: + description: "citycom upstream @ Forum Stadtpark (Fiber)" vlan: 501 prefix: 85.237.28.192/28 gateway: 85.237.28.193 @@ -240,9 +231,18 @@ network_zones: ele-dione: 5 # 85.237.28.197 ele-laptop: 7 # 85.237.28.199 - forum_a1: - description: "A1 upstream for general internet access (DSL)" + cc_dom: + description: "citycom upstream @ Dom im Berg (Fiber)" vlan: 502 + prefix: 85.237.2.96/28 + gateway: 85.237.2.97 + dns: + - 217.29.144.65 + - 217.29.144.66 + offsets: + ## citycom uses offset 1,2 and 3 + ele-router: 4 # 85.237.2.100 + ele-media: 5 # 85.237.2.101 dom_im_berg: description: "public wifi at Dom im Berg operated by Spielstätten (used by infobeamer)" @@ -250,6 +250,30 @@ network_zones: ssid: Dom key: "{{ vault_wifi_keys.dom_im_berg }}" + cc_leslie: + description: "citycom upstream @ Lesliehof (Fiber)" + vlan: 504 + prefix: x.x.x.x/y + gateway: x.x.x.x + dns: + - 217.29.144.65 + - 217.29.144.66 + offsets: + ## citycom uses offset 1,2 and 3 + ele-router-lesli: 4 # x.x.x.x+4 + + cc_hmtsaal: + description: "citycom upstream @ Heimatsaal (Fiber)" + vlan: 508 + prefix: x.x.x.x/y + gateway: x.x.x.x + dns: + - 217.29.144.65 + - 217.29.144.66 + offsets: + ## citycom uses offset 1,2 and 3 + ele-router: 4 # x.x.x.x+4 + funkfeuer: description: "funkfeuer access, subnet will be announced by olsr using HNA" vlan: 511 -- cgit v1.2.3