From cb006428feac7f330fee3098dbf749aec6ebf585 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Wed, 8 Jul 2020 03:16:17 +0200
Subject: vm/host/network: config initial setup works now

---
 roles/vm/host/network/tasks/main.yml          | 39 +++++++++++++++
 roles/vm/host/network/tasks/network.yml       | 22 --------
 roles/vm/host/network/templates/interfaces.j2 | 72 +++++++++++++++++++++++++++
 3 files changed, 111 insertions(+), 22 deletions(-)
 create mode 100644 roles/vm/host/network/tasks/main.yml
 delete mode 100644 roles/vm/host/network/tasks/network.yml
 create mode 100644 roles/vm/host/network/templates/interfaces.j2

(limited to 'roles/vm')

diff --git a/roles/vm/host/network/tasks/main.yml b/roles/vm/host/network/tasks/main.yml
new file mode 100644
index 00000000..e7668917
--- /dev/null
+++ b/roles/vm/host/network/tasks/main.yml
@@ -0,0 +1,39 @@
+---
+- name: install ifenslave package
+  when: "'bonds' in network"
+  apt:
+    name: ifenslave
+    state: present
+
+- name: install vlan package
+  when: "'vlans' in network"
+  apt:
+    name: vlan
+    state: present
+
+- name: create network interfaces
+  template:
+    src: interfaces.j2
+    dest: /etc/network/interfaces
+
+- name: create network bridges
+  when: "'bridges' in vm_host.network"
+  block:
+  - name: generate bridge interface config
+    loop: "{{ vm_host.network.bridges | default({}) | dict2items }}"
+    loop_control:
+      label: "{{ item.key }}"
+    template:
+      src: bridge-interfaces.j2
+      dest: "/etc/network/interfaces.d/br-{{ item.key }}"
+    register: vmhost_bridge_config
+
+  ## We don't try to be to clever here: aka don't call ifdown before ifup because
+  ## if there are VMs running they would end up with a broken network
+  - name: bring up bridge interfaces
+    loop: "{{ vmhost_bridge_config.results }}"
+    loop_control:
+      label: "br-{{ item.item.key }}"
+    when: item is changed
+    command: "/sbin/ifup br-{{ item.item.key }}"
+    failed_when: false
diff --git a/roles/vm/host/network/tasks/network.yml b/roles/vm/host/network/tasks/network.yml
deleted file mode 100644
index 103ff194..00000000
--- a/roles/vm/host/network/tasks/network.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- name: create network bridges
-  when: "'bridges' in vm_host.network"
-  block:
-  - name: generate bridge interface config
-    loop: "{{ vm_host.network.bridges | default({}) | dict2items }}"
-    loop_control:
-      label: "{{ item.key }}"
-    template:
-      src: bridge-interfaces.j2
-      dest: "/etc/network/interfaces.d/br-{{ item.key }}"
-    register: vmhost_bridge_config
-
-  ## We don't try to be to clever here: aka don't call ifdown before ifup because
-  ## if there are VMs running they would end up with a broken network
-  - name: bring up bridge interfaces
-    loop: "{{ vmhost_bridge_config.results }}"
-    loop_control:
-      label: "br-{{ item.item.key }}"
-    when: item is changed
-    command: "/sbin/ifup br-{{ item.item.key }}"
-    failed_when: false
diff --git a/roles/vm/host/network/templates/interfaces.j2 b/roles/vm/host/network/templates/interfaces.j2
new file mode 100644
index 00000000..eebfb8cc
--- /dev/null
+++ b/roles/vm/host/network/templates/interfaces.j2
@@ -0,0 +1,72 @@
+# This file describes the network interfaces available on your system
+# and how to activate them. For more information, see interfaces(5).
+
+# The loopback network interface
+auto lo
+iface lo inet loopback
+
+
+{% for bond in network.bonds | default([]) %}
+## Bond: {{ bond.name }}
+
+{%   for slave in bond.slaves | sort %}
+auto {{ slave }}
+iface {{ slave }} inet manual
+
+{%   endfor %}
+{%   set tmp = network.interfaces | selectattr('name', 'eq', bond.name) | list %}
+auto {{ bond.name }}
+iface {{ bond.name }} inet {{ ((tmp | length) == 0) | ternary('manual', 'static') }}
+  bond-mode {{ bond.mode }}
+  bond-slaves {{ bond.slaves | sort | join(' ') }}
+{%   for option in (bond.options | default({}) | list | sort) %}
+  bond-{{ option }} {{ bond.options[option] }}
+{%   endfor %}
+  up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/accept_ra
+  up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/autoconf
+{%   if (tmp | length) > 0 %}
+{%     set interface = tmp | first %}
+  address {{ interface.address | ipaddr('address') }}
+  netmask {{ interface.address | ipaddr('netmask') }}
+{%     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 %}
+{%     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 %}
+{%   endif %}
+
+
+{% endfor %}
+{% for parent in network.vlans | default({}) | list | sort %}
+## vlan interfaces @ {{ parent }}
+
+{%   for vlan in network.vlans[parent] %}
+auto {{ parent }}.{{ vlan }}
+iface {{ parent }}.{{ vlan }} inet manual
+{# TODO: add interface config like above if (network.interfaces | selectattr('name', 'eq', 'parent+'.'+vlan') | list) > 0 ... #}
+
+{%   endfor %}
+
+{% endfor %}
+
+## source bridge configs
+
+source /etc/network/interfaces.d/*
-- 
cgit v1.2.3