diff options
Diffstat (limited to 'inventory')
-rw-r--r-- | inventory/group_vars/elevate-festival/vars.yml | 5 | ||||
-rw-r--r-- | inventory/group_vars/glt-live/network.yml | 32 | ||||
-rw-r--r-- | inventory/host_vars/ele-tub.yml | 20 |
3 files changed, 42 insertions, 15 deletions
diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml index 5d86fa60..39641ff4 100644 --- a/inventory/group_vars/elevate-festival/vars.yml +++ b/inventory/group_vars/elevate-festival/vars.yml @@ -229,10 +229,11 @@ network_zones: murat_transfer: description: "transfer network for upstream via mur.at" - prefix: 172.31.255.0/24 + prefix: 172.31.255.240/28 offsets: ele-tub: 1 - ele-mur: 254 + ff-10g: 2 + ele-mur: 14 datacop_lte: description: "drei Upstream via router by datacop (LTE)" diff --git a/inventory/group_vars/glt-live/network.yml b/inventory/group_vars/glt-live/network.yml index c528dd20..74d2c780 100644 --- a/inventory/group_vars/glt-live/network.yml +++ b/inventory/group_vars/glt-live/network.yml @@ -47,21 +47,27 @@ network_zones: spel: 191 glt-gw-r3: 199 - r3_pub: - description: "realraum LAN, Internetuplink via Funkfeuer and mur.at" - vlan: 127 - # prefix: 89.106.211.32/27 - # gateway: 89.106.211.33 - # dns: - # - 89.106.211.33 - # offsets: - # glt-gw-r3: 29 - prefix: 192.168.28.0/24 - gateway: 192.168.28.254 + r3_ff: + description: "realraum Funkfeuer Subnet, Internetuplink via Funkfeuer and mur.at" + vlan: 255 + prefix: 10.12.240.240/28 + gateway: 10.12.240.247 dns: - - 9.9.9.9 + - 10.12.0.10 + # prefix: 192.168.28.0/24 + # gateway: 192.168.28.254 + # dns: + # - 9.9.9.9 + offsets: + glt-gw-r3: 8 + + murat_transfer: + description: "transfer network for upstream via mur.at" + prefix: 172.31.255.240/28 offsets: - glt-gw-r3: 61 + ele-tub: 1 + ff-10g: 2 + ele-mur: 14 tug_lan: description: "glt@tug LAN, Internetuplink via TUG and ACOnet" diff --git a/inventory/host_vars/ele-tub.yml b/inventory/host_vars/ele-tub.yml index 77a95e68..4ab8ae70 100644 --- a/inventory/host_vars/ele-tub.yml +++ b/inventory/host_vars/ele-tub.yml @@ -46,6 +46,18 @@ openwrt_mixin: /etc/htoprc: file: "{{ global_files_dir }}/common/htoprc" + /etc/rc.local: + content: | + # Put your custom commands here that should be executed once + # the system init finished. By default this file does nothing. + + ip rule add pref 42000 lookup default + ip rule del pref 32767 + ip route add default via {{ network_zones.murat_transfer.prefix | ipaddr(network_zones.murat_transfer.offsets['ele-mur']) | ipaddr('address') }} table 172 + ip rule add pref 33000 from {{ network_zones.funkfeuer.prefix }} lookup 172 + + exit 0 + openwrt_uci: system: @@ -106,6 +118,13 @@ openwrt_uci: netmask: 255.255.0.0 dns: "{{ network_zones.funkfeuer.dns }}" + - name: interface 'murattransfer' + options: + ifname: eth2 + proto: static + ipaddr: "{{ network_zones.murat_transfer.prefix | ipaddr(network_zones.murat_transfer.offsets[inventory_hostname]) | ipaddr('address') }}" + netmask: "{{ network_zones.murat_transfer.prefix | ipaddr('netmask') }}" + olsrd: - name: olsrd options: @@ -117,6 +136,7 @@ openwrt_uci: UseNiit: 'no' SmartGateway: 'no' MainIp: 10.12.91.28 + RtTableDefault: 253 - name: LoadPlugin options: |