diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2019-02-22 13:27:35 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2019-02-22 13:27:35 +0100 |
| commit | 2e6296049d5fdb4dc93a1e70e60d97a423a8cb7a (patch) | |
| tree | 2fc4b201fc4b6eb81d18925178b586a047e2b632 /inventory/host_vars | |
| parent | fix node names (diff) | |
elevate festival: new city netrange
Diffstat (limited to 'inventory/host_vars')
| -rw-r--r-- | inventory/host_vars/ele-media.yml | 3 | ||||
| -rw-r--r-- | inventory/host_vars/ele-router.yml | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml index c2c74fb4..b1eb90b6 100644 --- a/inventory/host_vars/ele-media.yml +++ b/inventory/host_vars/ele-media.yml @@ -12,7 +12,7 @@ network: mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}" gateway: "{{ network_zones.lan.gw }}" -network_setup: r3-with-lan +network_setup: elevate-festival dyndns: @@ -38,6 +38,7 @@ docker_lvm: size: 20G fs: ext4 +acmetool_directory_server: "{{ acmetool_directory_server_le_live }}" nextcloud_hostnames: - media.elevate.at diff --git a/inventory/host_vars/ele-router.yml b/inventory/host_vars/ele-router.yml index 6a3a906e..ca889d82 100644 --- a/inventory/host_vars/ele-router.yml +++ b/inventory/host_vars/ele-router.yml @@ -22,13 +22,13 @@ openwrt_network_external: ## for some reason vlan-id 128 does not work. why?? # ifname: 'eth0.{{ network_wan_zone.vlan }}' ifname: 'eth0.1' - proto: dhcp - # proto: static - # ipaddr: "{{ network_wan_zone.prefix | ipaddr(network_wan_zone.offsets[inventory_hostname]) | ipaddr('address') }}" - # netmask: "{{ network_wan_zone.prefix | ipaddr('netmask') }}" - # gateway: "{{ network_wan_zone.gw }}" - # dns: "{{ network_wan_zone.dns }}" - # accept_ra: 0 +# proto: dhcp + proto: static + ipaddr: "{{ network_wan_zone.prefix | ipaddr(network_wan_zone.offsets[inventory_hostname]) | ipaddr('address') }}" + netmask: "{{ network_wan_zone.prefix | ipaddr('netmask') }}" + gateway: "{{ network_wan_zone.gw }}" + dns: "{{ network_wan_zone.dns }}" + accept_ra: 0 openwrt_network_internal: "{{ openwrt_network_internal_yaml | from_yaml }}" openwrt_network_internal_yaml: | |