diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2023-03-09 23:03:39 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2023-03-09 23:03:39 +0100 |
| commit | df22cc55175eeda05c843763b9a21e2226e5fea6 (patch) | |
| tree | 875a5738ca5f3f4d89dc7ec3955641f07edaebf4 | |
| parent | elevate: switch back chaos-at-home internal addresses (diff) | |
ele-router: cleanup some stuff
| -rw-r--r-- | inventory/host_vars/ele-router-hmtsaal.yml | 11 | ||||
| -rw-r--r-- | inventory/host_vars/ele-router-orpheum.yml | 11 | ||||
| -rw-r--r-- | inventory/hosts.ini | 2 |
3 files changed, 18 insertions, 6 deletions
diff --git a/inventory/host_vars/ele-router-hmtsaal.yml b/inventory/host_vars/ele-router-hmtsaal.yml index e10abad8..becaf9fa 100644 --- a/inventory/host_vars/ele-router-hmtsaal.yml +++ b/inventory/host_vars/ele-router-hmtsaal.yml @@ -44,9 +44,16 @@ openwrt_network_base: ipaddr: 127.0.0.1 netmask: 255.0.0.0 + - name: device + options: + type: bridge + name: "br-mgmt" + ports: + - "eth0.{{ network_mgmt_zone.vlan }}" + - name: interface 'mgmt' options: - device: "eth0.{{ network_mgmt_zone.vlan }}" + device: "br-mgmt" proto: static ipaddr: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" netmask: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr('netmask') }}" @@ -188,7 +195,7 @@ openwrt_mixin: define nic_citycom = eth1 define ip_citycom = {{ network_zones.cc_hmtsaal.prefix | ansible.utils.ipaddr(network_zones.cc_hmtsaal.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }} - define nic_mgmt = "eth0.{{ network_mgmt_zone.vlan }}" + define nic_mgmt = "br-mgmt" define prefix_mgmt = {{ network_mgmt_zone.prefix }} {% for zone_name in network_internal_zone_names %} diff --git a/inventory/host_vars/ele-router-orpheum.yml b/inventory/host_vars/ele-router-orpheum.yml index 7aaf4fee..6dfe2db9 100644 --- a/inventory/host_vars/ele-router-orpheum.yml +++ b/inventory/host_vars/ele-router-orpheum.yml @@ -44,9 +44,16 @@ openwrt_network_base: ipaddr: 127.0.0.1 netmask: 255.0.0.0 + - name: device + options: + type: bridge + name: "br-mgmt" + ports: + - "eth0.{{ network_mgmt_zone.vlan }}" + - name: interface 'mgmt' options: - device: "eth0.{{ network_mgmt_zone.vlan }}" + device: "br-mgmt" proto: static ipaddr: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" netmask: "{{ network_mgmt_zone.prefix | ansible.utils.ipaddr('netmask') }}" @@ -182,7 +189,7 @@ openwrt_mixin: define nic_citycom = eth1 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 nic_mgmt = "br-mgmt" define prefix_mgmt = {{ network_mgmt_zone.prefix }} {% for zone_name in network_internal_zone_names %} diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 6f85fc3b..5745aa27 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -190,7 +190,6 @@ env_group=dan [elevate] ele-media host_name=media -ele-router ele-router-hmtsaal ele-router-orpheum ele-router-emc @@ -295,7 +294,6 @@ mz-ap mz-router glt-gw-r3 glt-gw-tug -ele-router ele-router-hmtsaal ele-router-orpheum ele-router-emc |