From c78debbbb6f8c4093fbf1b2301f889d0ea6a7495 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 4 Jul 2022 02:02:14 +0200 Subject: elevate-festival: refactor numbering of vlans (cont'd) --- inventory/group_vars/elevate-festival/vars.yml | 4 ++-- inventory/host_vars/ele-mon.yml | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml index 7dd7fc7f..7edecc34 100644 --- a/inventory/group_vars/elevate-festival/vars.yml +++ b/inventory/group_vars/elevate-festival/vars.yml @@ -213,8 +213,8 @@ network_zones: vlan: 250 prefix: 192.168.250.0/24 - forum_a1: - description: "A1 upstream for general internet access (DSL)" + a1_forum: + description: "A1 upstream @ Forum Stadtpark (DSL)" vlan: 500 cc_forum: diff --git a/inventory/host_vars/ele-mon.yml b/inventory/host_vars/ele-mon.yml index 5d03837c..e218ef7b 100644 --- a/inventory/host_vars/ele-mon.yml +++ b/inventory/host_vars/ele-mon.yml @@ -21,10 +21,6 @@ install: name: lan0 - bridge: br-mgmt name: mgmt0 - - bridge: br-funkfeuer - name: funkfeuer0 - - bridge: br-forum_a1 - name: funkfeuer1 network: nameservers: "{{ network_zones.lan.dns }}" @@ -39,10 +35,6 @@ network: - *_network_primary_ - name: mgmt0 address: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" - - name: funkfeuer0 - address: "{{ network_zones.murat_transfer.prefix | ipaddr(network_zones.murat_transfer.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" - - name: funkfeuer1 - address: "{{ network_zones.funkfeuer.prefix | ipaddr(network_zones.funkfeuer.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" ssh_users_root: -- cgit v1.2.3