Merge branch 'topic/vm-host-network'

5 files changed, 55 insertions, 1 deletions

diff --git a/inventory/group_vars/vmhost-ch-oulu/main.yml b/inventory/group_vars/vmhost-ch-oulu/main.yml
new file mode 100644
index 00000000..db5daa9c
--- /dev/null
+++ b/inventory/group_vars/vmhost-ch-oulu/main.yml
@@ -0,0 +1,21 @@
+---
+__vmhost_bridge_interface_zones__:
+  bond0:
+    - lan
+    - svc
+    - mgmt
+
+__vmhost_bridge_interface_zones_yaml__: |
+  {% for interface in (__vmhost_bridge_interface_zones__.keys() | sort) %}
+  {%   for zone in __vmhost_bridge_interface_zones__[interface] %}
+  {{ zone }}:
+    interfaces:
+      - {{ interface }}.{{ network_zones[zone].vlan }}
+  {%   endfor %}
+  {% endfor %}
+
+
+vm_host:
+  name: ch-oulu
+  network:
+    bridges: "{{ __vmhost_bridge_interface_zones_yaml__ | from_yaml }}"
diff --git a/inventory/host_vars/ch-atlas.yml b/inventory/host_vars/ch-atlas.yml
index aa2c2e0c..120e007d 100644
--- a/inventory/host_vars/ch-atlas.yml
+++ b/inventory/host_vars/ch-atlas.yml
@@ -9,3 +9,6 @@ network:
 #    address6: "{{ vm_host.network.bridges.public.prefix6 | ipaddr(vm_host.network.bridges.public.offsets6[inventory_hostname]) | ipaddr('address/prefix') }}"
     address6: "{{ vm_host.network.bridges.public.prefix6 | ipaddr(41) | ipaddr('address/prefix') }}"
     gateway6: "{{ vm_host.network.bridges.public.gateway6 }}"
+  vlans:
+    eth0:
+    - 502
diff --git a/inventory/host_vars/ch-gnocchi.yml b/inventory/host_vars/ch-gnocchi.yml
index c52a1cf4..ff27a081 100644
--- a/inventory/host_vars/ch-gnocchi.yml
+++ b/inventory/host_vars/ch-gnocchi.yml
@@ -13,6 +13,10 @@ network:
   interfaces:
   - name: br-mgmt
     address: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+  vlans:
+    enp1s0: "{{ __vmhost_bridge_interface_zones__['enp1s0'] | map('extract', network_zones) | map(attribute='vlan') | list }}"
+    enp2s0: "{{ __vmhost_bridge_interface_zones__['enp2s0'] | map('extract', network_zones) | map(attribute='vlan') | list }}"
+    enp3s0: "{{ __vmhost_bridge_interface_zones__['enp3s0'] | map('extract', network_zones) | map(attribute='vlan') | list }}"
 
 
 apt_repo_components:
diff --git a/inventory/host_vars/ch-oulu.yml b/inventory/host_vars/ch-oulu.yml
index e63e6f2d..f6ef0e4c 100644
--- a/inventory/host_vars/ch-oulu.yml
+++ b/inventory/host_vars/ch-oulu.yml
@@ -1,4 +1,6 @@
 ---
+install_interface: eno1
+
 install:
   efi: true
   disks:
@@ -16,8 +18,23 @@ network:
     - 9.9.9.9
   domain: "{{ host_domain }}"
   primary: &_network_primary_
-    name: eno1
+    name: br-lan
     address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
     gateway: "{{ network_zones.lan.gateway }}"
   interfaces:
   - *_network_primary_
+  bonds:
+  - name: bond0
+    mode: 802.3ad
+    slaves:
+    - eno1
+    - eno2
+    options:
+      miimon: 100
+  vlans:
+    bond0: "{{ __vmhost_bridge_interface_zones__['bond0'] | map('extract', network_zones) | map(attribute='vlan') | list }}"
+
+apt_repo_components:
+  - main
+  - contrib
+  - non-free ## for microcode updates
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 5d19bee4..549e494b 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -231,6 +231,13 @@ ch-atlas
 [vmhost-ch-atlas:children]
 vmhost-ch-atlas-guests
 
+[vmhost-ch-oulu-guests]
+ch-oulu-vm1
+[vmhost-ch-oulu]
+ch-oulu
+[vmhost-ch-oulu:children]
+vmhost-ch-oulu-guests
+
 [vmhost-sk-2019vm-guests]
 sk-testvm
 sk-torrent
@@ -255,12 +262,14 @@ vmhost-sk-tomnext-guests
 [kvmhosts]
 ch-gnocchi
 ch-atlas
+ch-oulu
 sk-2019vm
 sk-tomnext
 
 [kvmguests:children]
 vmhost-ch-gnocchi-guests
 vmhost-ch-atlas-guests
+vmhost-ch-oulu-guests
 vmhost-sk-2019vm-guests
 vmhost-sk-tomnext-guests