From 6eacc2ad5539abf37dc90cd378b44320f7758869 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 7 Jul 2020 22:09:19 +0200
Subject: refactor vm role names

---
 roles/vm/network/templates/interfaces.j2   | 56 ------------------------------
 roles/vm/network/templates/resolv.conf.j2  |  4 ---
 roles/vm/network/templates/systemd.link.j2 |  5 ---
 3 files changed, 65 deletions(-)
 delete mode 100644 roles/vm/network/templates/interfaces.j2
 delete mode 100644 roles/vm/network/templates/resolv.conf.j2
 delete mode 100644 roles/vm/network/templates/systemd.link.j2

(limited to 'roles/vm/network/templates')

diff --git a/roles/vm/network/templates/interfaces.j2 b/roles/vm/network/templates/interfaces.j2
deleted file mode 100644
index 8c288669..00000000
--- a/roles/vm/network/templates/interfaces.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-source /etc/network/interfaces.d/*
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-{% for interface in network_cooked.interfaces %}
-
-
-auto {{ interface.name }}
-iface {{ interface.name }} inet static
-  pre-up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/accept_ra
-  pre-up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/autoconf
-  address {{ interface.address | ipaddr('address') }}
-  netmask {{ interface.address | ipaddr('netmask') }}
-{%   if 'overlay' in interface %}
-  up /bin/ip addr add dev $IFACE {{ interface.overlay }}/32
-{%     for route in interface.static_routes | default([]) %}
-  up /bin/ip route add {{ route.destination }} via {{ route.gateway }} src {{ interface.overlay }}
-{%     endfor %}
-{%     if 'gateway' in interface %}
-  up /bin/ip route add default via {{ interface.gateway }} src {{ interface.overlay }}
-  down /bin/ip route del default via {{ interface.gateway }} src {{ interface.overlay }}
-{%     for route in interface.static_routes | default([]) | reverse %}
-  down /bin/ip route del {{ route.destination }} via {{ route.gateway }} src {{ interface.overlay }}
-{%     endfor %}
-{%     endif %}
-  down /bin/ip addr del dev $IFACE {{ interface.overlay }}/32
-{%   else %}
-{%     if 'gateway' in interface %}
-  gateway {{ interface.gateway }}
-{%     endif %}
-{%     for route in interface.static_routes | default([]) %}
-  up /bin/ip route add {{ route.destination }} via {{ route.gateway }}
-{%     endfor %}
-{%     for route in interface.static_routes | default([]) | reverse %}
-  down /bin/ip route del {{ route.destination }} via {{ route.gateway }}
-{%     endfor %}
-{%   endif %}
-{%   if 'address6' in interface %}
-
-iface {{ interface.name }} inet6 static
-  address {{ interface.address6 }}
-{%     if 'gateway6' in interface %}
-  gateway {{ interface.gateway6 }}
-{%     endif %}
-{%     for route in interface.static_routes6 | default([]) %}
-  up /bin/ip -6 route add {{ route.destination }} via {{ route.gateway }}
-{%     endfor %}
-{%     for route in interface.static_routes6 | default([])  | reverse %}
-  down /bin/ip -6 route del {{ route.destination }} via {{ route.gateway }}
-{%     endfor %}
-{%   endif %}
-{% endfor %}
diff --git a/roles/vm/network/templates/resolv.conf.j2 b/roles/vm/network/templates/resolv.conf.j2
deleted file mode 100644
index 00aaafe3..00000000
--- a/roles/vm/network/templates/resolv.conf.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-{% for nsrv in network_cooked.nameservers %}
-nameserver {{ nsrv }}
-{% endfor %}
-search {{ network_cooked.domain }}
diff --git a/roles/vm/network/templates/systemd.link.j2 b/roles/vm/network/templates/systemd.link.j2
deleted file mode 100644
index 7093e164..00000000
--- a/roles/vm/network/templates/systemd.link.j2
+++ /dev/null
@@ -1,5 +0,0 @@
-[Match]
-Path=*pci-0000:01:{{ "%02d" | format(interface_index + 1) }}.0
-
-[Link]
-Name={{ item.name }}
-- 
cgit v1.2.3