elevate: prepare routers for e23

8 files changed, 70 insertions, 46 deletions

diff --git a/dan/host_vars/ele-router.yml b/_graveyard_/dan/host_vars/ele-router.yml
index 2730423b..2730423b 100644
--- a/dan/host_vars/ele-router.yml
+++ b/_graveyard_/dan/host_vars/ele-router.yml
diff --git a/inventory/host_vars/ele-router.yml b/_graveyard_/inventory/host_vars/ele-router.yml
index bddb40e8..bddb40e8 100644
--- a/inventory/host_vars/ele-router.yml
+++ b/_graveyard_/inventory/host_vars/ele-router.yml
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"
diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml
index 74f437e5..91bcc1cd 100644
--- a/inventory/host_vars/ele-calypso.yml
+++ b/inventory/host_vars/ele-calypso.yml
@@ -72,7 +72,7 @@ kubernetes_standalone_cni_variant: with-portmap
 
 player_inst_name: emc-feed
 player_ffmpeg_image_version: bullseye-decklink11.7-2022-07-08.29
-#player_input: [ '-f', 'live_flv', '-rtmp_live', 'live', '-i', "rtmp://{{ network_zones.cc_leslie.prefix | ansible.utils.ipaddr(network_zones.cc_leslie.offsets['ele-thetys']) | ansible.utils.ipaddr('address') }}/emc-feed/full" ]
+#player_input: [ '-f', 'live_flv', '-rtmp_live', 'live', '-i', "rtmp://{{ network_zones.cc_orpheum.prefix | ansible.utils.ipaddr(network_zones.cc_orpheum.offsets['ele-thetys']) | ansible.utils.ipaddr('address') }}/emc-feed/full" ]
 player_input: [ '-stream_loop', '-1', '-i', '/srv/videos/Big Buck Bunny 1080p 60fps.mp4' ]
 player_output: [ '-ac', '2', '-pix_fmt', 'uyvy422', '-s', '1920x1080' ,'-r', '50','-f', 'decklink', 'DeckLink Mini Monitor 4K' ]
 player_volume_mounts:
diff --git a/inventory/host_vars/ele-router-leslie.yml b/inventory/host_vars/ele-router-orpheum.yml
index 1aa9a2b2..249f5d52 100644
--- a/inventory/host_vars/ele-router-leslie.yml
+++ b/inventory/host_vars/ele-router-orpheum.yml
@@ -13,10 +13,10 @@ openwrt_network_external:
     options:
       device: 'eth1'
       proto: static
-      ipaddr: "{{ network_zones.cc_leslie.prefix | ansible.utils.ipaddr(network_zones.cc_leslie.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}"
-      netmask: "{{ network_zones.cc_leslie.prefix | ansible.utils.ipaddr('netmask') }}"
-      gateway: "{{ network_zones.cc_leslie.gateway }}"
-      dns: "{{ network_zones.cc_leslie.dns }}"
+      ipaddr: "{{ network_zones.cc_orpheum.prefix | ansible.utils.ipaddr(network_zones.cc_orpheum.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}"
+      netmask: "{{ network_zones.cc_orpheum.prefix | ansible.utils.ipaddr('netmask') }}"
+      gateway: "{{ network_zones.cc_orpheum.gateway }}"
+      dns: "{{ network_zones.cc_orpheum.dns }}"
       accept_ra: 0
 
 openwrt_network_internal: "{{ openwrt_network_internal_yaml | from_yaml }}"
@@ -97,7 +97,7 @@ openwrt_dhcp_base:
       leasefile: '/tmp/dhcp.leases'
       resolvfile: '/tmp/resolv.conf.auto'
       localservice: '1'
-      server: "{{ network_zones.cc_leslie.dns }}"
+      server: "{{ network_zones.cc_orpheum.dns }}"
 
   - name: odhcpd 'odhcpd'
     options:
@@ -180,7 +180,7 @@ openwrt_mixin:
       flush ruleset
 
       define nic_citycom = eth1
-      define ip_citycom = {{ network_zones.cc_leslie.prefix | ansible.utils.ipaddr(network_zones.cc_leslie.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}
+      define ip_citycom = {{ network_zones.cc_orpheum.prefix | ansible.utils.ipaddr(network_zones.cc_orpheum.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}
 
       define nic_mgmt = "eth0.{{ network_mgmt_zone.vlan }}"
       define prefix_mgmt = {{ network_mgmt_zone.prefix }}
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index d8a00b4d..1fee8710 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -8,12 +8,12 @@ install:
     - "consoleblank=0"
 
 network:
-  nameservers: "{{ network_zones.cc_leslie.dns }}"
+  nameservers: "{{ network_zones.cc_orpheum.dns }}"
   domain: "{{ host_domain }}"
   primary: &_network_primary_
     name: eno1
-    address: "{{ network_zones.cc_leslie.prefix | ansible.utils.ipaddr(network_zones.cc_leslie.offsets[inventory_hostname]) }}"
-    gateway: "{{ network_zones.cc_leslie.gateway }}"
+    address: "{{ network_zones.cc_orpheum.prefix | ansible.utils.ipaddr(network_zones.cc_orpheum.offsets[inventory_hostname]) }}"
+    gateway: "{{ network_zones.cc_orpheum.gateway }}"
   interfaces:
   - *_network_primary_
 
@@ -54,7 +54,7 @@ prometheus_exporter_node_textfile_collector_scripts:
 prometheus_job_multitarget_blackbox__probe:
   ele-calypso:
   - instance: "ssh-{{ inventory_hostname }}"
-    target: "{{ network_zones.cc_leslie.prefix | ansible.utils.ipaddr(network_zones.cc_leslie.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
+    target: "{{ network_zones.cc_orpheum.prefix | ansible.utils.ipaddr(network_zones.cc_orpheum.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
 
 
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 515998aa..97b3ac21 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -192,7 +192,7 @@ env_group=dan
 ele-media host_name=media
 ele-router
 ele-router-hmtsaal
-ele-router-leslie
+ele-router-orpheum
 ele-router-emc
 ele-telesto host_name=telesto
 ele-thetys host_name=thetys
@@ -228,7 +228,7 @@ ele-infobeamer
 # ele-ap-uhrturm0
 # ele-ap-nextlib[0:6]
 ele-ap-hmtsaal[0:3]
-ele-ap-leslie[0:1]
+ele-ap-orpheum[0:1]
 
 [ele-ups]
 # ele-ups-forum[0:1]
@@ -236,7 +236,7 @@ ele-ap-leslie[0:1]
 # ele-ups-parkhouse0
 # ele-ups-nextlib[0:3]
 ele-ups-hmtsaal[0:2]
-ele-ups-leslie0
+ele-ups-orpheum0
 
 [ele-dolmetsch-raspi]
 ele-dol-raspi0
@@ -289,7 +289,7 @@ glt-gw-r3
 glt-gw-tug
 ele-router
 ele-router-hmtsaal
-ele-router-leslie
+ele-router-orpheum
 ele-router-emc
 ele-uhrturm
 ele-orpheum
@@ -453,7 +453,7 @@ ele-telesto
 #ele-router-emc
 #ele-ap-hmtsaal[0:3]
 #ele-ups-hmtsaal[0:2]
-#ele-router-leslie
+#ele-router-orpheum
 #ele-thetys
 [promzone-elevate-festival:children]
 #ele-ap