summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inventory/group_vars/elevate-festival/vars.yml44
-rw-r--r--inventory/hosts.ini5
2 files changed, 24 insertions, 25 deletions
diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml
index f97663d2..ad09738a 100644
--- a/inventory/group_vars/elevate-festival/vars.yml
+++ b/inventory/group_vars/elevate-festival/vars.yml
@@ -284,20 +284,20 @@ network_zones:
cc_orpheum:
description: "citycom upstream @ Orpheum (Fiber)"
vlan: 504
- prefix: 91.143.110.160/28
- gateway: 91.143.110.161
- #prefix: 192.168.28.0/24
- #gateway: 192.168.28.254
+ #prefix: 91.143.110.160/28
+ #gateway: 91.143.110.161
+ prefix: 192.168.28.0/24
+ gateway: 192.168.28.254
dns:
- #- 1.1.1.1
- - 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-orpheum: 4 # 91.143.110.164
- ele-thetys: 5 # 91.143.110.165
- #ele-router-orpheum: 4 # 192.168.28.4
- #ele-thetys: 5 # 192.168.28.5
+ #ele-router-orpheum: 4 # 91.143.110.164
+ #ele-thetys: 5 # 91.143.110.165
+ ele-router-orpheum: 4 # 192.168.28.4
+ ele-thetys: 5 # 192.168.28.5
# cc_leslie:
# description: "citycom upstream @ Lesliehof (Fiber)"
@@ -315,20 +315,20 @@ network_zones:
cc_hmtsaal:
description: "citycom upstream @ Heimatsaal (Fiber)"
vlan: 508
- prefix: 109.73.146.224/29
- gateway: 109.73.146.225
- #prefix: 192.168.28.0/24
- #gateway: 192.168.28.254
+ #prefix: 109.73.146.224/29
+ #gateway: 109.73.146.225
+ prefix: 192.168.28.0/24
+ gateway: 192.168.28.254
dns:
- #- 1.1.1.1
- - 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-router-hmtsaal: 2 # 192.168.28.2
- #ele-router-emc: 3 # 192.168.28.3
+ #ele-router-hmtsaal: 4 # 109.73.146.228
+ #ele-router-emc: 5 # 109.73.146.229
+ ele-router-hmtsaal: 2 # 192.168.28.2
+ ele-router-emc: 3 # 192.168.28.3
funkfeuer:
description: "funkfeuer access, subnet will be announced by olsr using HNA"
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index f8d11002..5a012243 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -296,13 +296,12 @@ ele-emc-r0 host_name=emc-r0
[elevate-mediachannel-edge]
ele-emc-e01 host_name=emc-e01
-ele-emc-e02 host_name=emc-e02
-ele-emc-e03 host_name=emc-e03
[elevate-mediachannel-lb]
ele-emc-lb host_name=emc-lb
-#[elevate-mediachannel_todelete]
+[elevate-mediachannel_todelete]
+#ele-emc-e02 host_name=emc-e02
#ele-emc-e03 host_name=emc-e03