diff options
Diffstat (limited to 'inventory/group_vars')
-rw-r--r-- | inventory/group_vars/ele-ap/vars.yml | 15 | ||||
-rw-r--r-- | inventory/group_vars/elevate-festival/vars.yml | 69 |
2 files changed, 54 insertions, 30 deletions
diff --git a/inventory/group_vars/ele-ap/vars.yml b/inventory/group_vars/ele-ap/vars.yml index f7f31a37..dd9e9f6f 100644 --- a/inventory/group_vars/ele-ap/vars.yml +++ b/inventory/group_vars/ele-ap/vars.yml @@ -30,8 +30,8 @@ accesspoint_wifi_channels: ele-ap-hmtsaal1: 13 ele-ap-hmtsaal2: 9 ele-ap-hmtsaal3: 5 - ele-ap-leslie0: 3 - ele-ap-leslie1: 9 + ele-ap-orpheum0: 3 + ele-ap-orpheum1: 9 5g: # ele-ap-forum0: 40 # ele-ap-forum1: 48 @@ -51,8 +51,8 @@ accesspoint_wifi_channels: ele-ap-hmtsaal1: 48 ele-ap-hmtsaal2: 44 ele-ap-hmtsaal3: 40 - ele-ap-leslie0: 36 - ele-ap-leslie1: 48 + ele-ap-orpheum0: 36 + ele-ap-orpheum1: 48 accesspoint_wifi_txpower: 2g: @@ -74,8 +74,8 @@ accesspoint_wifi_txpower: ele-ap-hmtsaal1: 13 ele-ap-hmtsaal2: 9 ele-ap-hmtsaal3: 5 - ele-ap-leslie0: 3 - ele-ap-leslie1: 9 + ele-ap-orpheum0: 3 + ele-ap-orpheum1: 9 accesspoint_wifi_device_htmode: 2g: "HT20" @@ -97,9 +97,8 @@ accesspoint_client_steering: accesspoint_ntp_servers: -# - '{{ network_zones.mgmt.prefix | ansible.utils.ipaddr(network_zones.mgmt.offsets["ele-router"]) | ansible.utils.ipaddr("address") }}' - '{{ network_zones.mgmt.prefix | ansible.utils.ipaddr(network_zones.mgmt.offsets["ele-router-hmtsaal"]) | ansible.utils.ipaddr("address") }}' - - '{{ network_zones.mgmt.prefix | ansible.utils.ipaddr(network_zones.mgmt.offsets["ele-router-leslie"]) | ansible.utils.ipaddr("address") }}' + - '{{ network_zones.mgmt.prefix | ansible.utils.ipaddr(network_zones.mgmt.offsets["ele-router-orpheum"]) | ansible.utils.ipaddr("address") }}' prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:9100" diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml index 99ffdbcd..95c95bb1 100644 --- a/inventory/group_vars/elevate-festival/vars.yml +++ b/inventory/group_vars/elevate-festival/vars.yml @@ -106,14 +106,15 @@ network_zones: # ele-ap-kunsthaus0: 130 ### Orpheum - # ele-sw-orpheum0: 40 + ele-sw-orpheum0: 40 # ele-br-orpheum0: 49 # --> ele-br-uhrturm1 - # ele-ap-orpheum0: 140 + ele-ap-orpheum0: 140 + ele-ap-orpheum1: 141 ### Lesliehof - ele-sw-leslie0: 40 - ele-ap-leslie0: 140 - ele-ap-leslie1: 141 + # ele-sw-leslie0: 40 + # ele-ap-leslie0: 140 + # ele-ap-leslie1: 141 ### Uhrturm/Rosengarten/Uhrturm-Kasematten # ele-sw-uhrturm0: 50 @@ -161,14 +162,14 @@ network_zones: ele-ups-hmtsaal0: 210 ele-ups-hmtsaal1: 211 ele-ups-hmtsaal2: 212 - ele-ups-leslie0: 213 + ele-ups-orpheum0: 213 ### Other ele-tub: 240 datacop: 249 ch-equinox-t450s: 250 ele-router-emc: 251 - ele-router-leslie: 252 + ele-router-orpheum: 252 ele-router-hmtsaal: 253 ele-router: 254 @@ -260,32 +261,56 @@ network_zones: ssid: Dom key: "{{ vault_wifi_keys.dom_im_berg }}" - cc_leslie: - description: "citycom upstream @ Lesliehof (Fiber)" + cc_orpheum: + description: "citycom upstream @ Orpheum (Fiber)" vlan: 504 - prefix: 85.237.24.176/29 - gateway: 85.237.24.177 + # prefix: ?.?.?.?/29 + # gateway: ?.?.?.? + prefix: 192.168.28.0/24 + gateway: 192.168.28.254 dns: - - 217.29.144.65 - - 217.29.144.66 + - 1.1.1.1 + # - 217.29.144.65 + # - 217.29.144.66 offsets: ## citycom uses offset 1,2 and 3 - ele-router-leslie: 4 # 85.237.24.180 - ele-thetys: 5 # 85.237.24.181 + # ele-router-orpheum: 4 # ?.?.?.? + # ele-thetys: 5 # ?.?.?.? + ele-router-orpheum: 5 # 192.168.28.5 + ele-thetys: 6 # 192.168.28.6 + + # cc_leslie: + # description: "citycom upstream @ Lesliehof (Fiber)" + # vlan: 504 + # prefix: 85.237.24.176/29 + # gateway: 85.237.24.177 + # dns: + # - 217.29.144.65 + # - 217.29.144.66 + # offsets: + # ## citycom uses offset 1,2 and 3 + # ele-router-leslie: 4 # 85.237.24.180 + # ele-thetys: 5 # 85.237.24.181 cc_hmtsaal: description: "citycom upstream @ Heimatsaal (Fiber)" vlan: 508 - prefix: 109.73.146.224/29 - gateway: 109.73.146.225 + # prefix: 109.73.146.224/29 + # gateway: 109.73.146.225 + prefix: 192.168.28.0/24 + gateway: 192.168.28.254 dns: - - 217.29.144.65 - - 217.29.144.66 + - 1.1.1.1 + # - 217.29.144.65 + # - 217.29.144.66 offsets: ## citycom uses offset 1,2 and 3 - ele-router-hmtsaal: 4 # 109.73.146.228 - ele-router-emc: 5 # 109.73.146.229 - ele-telesto: 6 # 109.73.146.230 + # ele-router-hmtsaal: 4 # 109.73.146.228 + # ele-router-emc: 5 # 109.73.146.229 + # ele-telesto: 6 # 109.73.146.230 + ele-router-hmtsaal: 2 # 192.168.28.2 + ele-router-emc: 3 # 192.168.28.3 + ele-telesto: 4 # 192.168.28.4 funkfeuer: description: "funkfeuer access, subnet will be announced by olsr using HNA" |