diff options
-rw-r--r-- | inventory/group_vars/chaos-at-home/network.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/ch-k8s-ctrl.yml | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index 1fb4a94f..d72f13ce 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -23,6 +23,7 @@ network_zones: ch-hyperion: 25 ch-ymir: 26 ch-tarvos: 27 + ch-k8s-ctrl: 29 ch-hpws-maxi: 30 ch-hpws-mini1: 31 ch-alix1d: 32 @@ -73,7 +74,6 @@ network_zones: ch-http-proxy: 8 ch-imap-proxy: 9 ch-vpn: 10 - ch-k8s-ctrl: 20 ch-jump: 22 ch-gw-lan: 28 ch-iot: 30 diff --git a/inventory/host_vars/ch-k8s-ctrl.yml b/inventory/host_vars/ch-k8s-ctrl.yml index ece6cb73..232963b2 100644 --- a/inventory/host_vars/ch-k8s-ctrl.yml +++ b/inventory/host_vars/ch-k8s-ctrl.yml @@ -1,6 +1,4 @@ --- -install_jumphost: ch-jump - system_lvm_volume_size_root: 3G install: vm: @@ -17,21 +15,18 @@ install: properties: 'syncoid:sync': 'false' interfaces: - - bridge: br-svc - name: svc0 + - bridge: br-lan + name: lan0 network: - nameservers: "{{ network_zones.svc.dns }}" + nameservers: "{{ network_zones.lan.dns }}" domain: "{{ host_domain }}" systemd_link: interfaces: "{{ install.interfaces }}" primary: &_network_primary_ - name: svc0 - address: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) }}" - gateway: "{{ network_zones.svc.gateway }}" - static_routes: - - destination: "{{ network_zones.lan.prefix }}" - gateway: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ansible.utils.ipaddr('address') }}" + name: lan0 + address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.lan.gateway }}" interfaces: - *_network_primary_ |