From a567a9e27ffa0f663f31247ebe6c9cba1615bb2b Mon Sep 17 00:00:00 2001 From: Jean-Marie Mineau Date: Thu, 8 Jul 2021 00:43:58 +0200 Subject: [PATCH] add gateways --- host_vars/vm2/networking.yml | 6 +----- host_vars/vm3/networking.yml | 3 +-- host_vars/vm4/networking.yml | 2 -- roles/networking/templates/interfaces.j2 | 3 +++ 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/host_vars/vm2/networking.yml b/host_vars/vm2/networking.yml index 362308a..f05677f 100644 --- a/host_vars/vm2/networking.yml +++ b/host_vars/vm2/networking.yml @@ -1,11 +1,7 @@ --- interfaces: enp0s3: - ipv4: 10.0.2.6 - netmaskv4: 24 - type: static - routes: - - {subnet: 0.0.0.0, netmask: 0, gateway: 10.0.2.1} + type: dhcp wg0: ipv4: "{{ intranet.subnets.test.subnets.vm2.ipv4 }}" netmaskv4: "{{ intranet.netmaskv4 }}" diff --git a/host_vars/vm3/networking.yml b/host_vars/vm3/networking.yml index 970d82b..71acd30 100644 --- a/host_vars/vm3/networking.yml +++ b/host_vars/vm3/networking.yml @@ -4,8 +4,7 @@ interfaces: ipv4: 10.0.2.7 netmaskv4: 24 type: static - routes: - - {subnet: 0.0.0.0, netmask: 0, gateway: 10.0.2.1} + gateway: 10.0.2.1 wg0: ipv4: "{{ intranet.subnets.test.subnets.vm3.ipv4 }}" netmaskv4: "{{ intranet.netmaskv4 }}" diff --git a/host_vars/vm4/networking.yml b/host_vars/vm4/networking.yml index 620374b..1e9e9b4 100644 --- a/host_vars/vm4/networking.yml +++ b/host_vars/vm4/networking.yml @@ -5,8 +5,6 @@ interfaces: netmaskv4: 24 type: static gateway: 10.0.2.1 -# routes: -# - {subnet: 0.0.0.0, netmask: 0, gateway: 10.0.2.1} wg0: ipv4: "{{ intranet.subnets.test.subnets.vm4.ipv4 }}" netmaskv4: "{{ intranet.netmaskv4 }}" diff --git a/roles/networking/templates/interfaces.j2 b/roles/networking/templates/interfaces.j2 index 69bc40e..a4d35c1 100644 --- a/roles/networking/templates/interfaces.j2 +++ b/roles/networking/templates/interfaces.j2 @@ -20,6 +20,9 @@ iface {{ item.key }} inet static {% if 'ipv4' in item.value %} address {{ item.value.ipv4 }}/{{ item.value.netmaskv4 }} {% endif %} +{% if 'gateway' in item.value %} + gateway {{ item.value.gateway }} +{% endif %} {% if 'routes' in item.value %}{# route dw #} {% for route in item.value.routes %} post-down ip route del {{ route.subnet }}/{{ route.netmask }} via {{ route.gateway }}