3 files changed, 15 insertions, 28 deletions
diff --git a/chaos-at-home/ch-atlas.yml b/chaos-at-home/ch-atlas.yml
index 34fa1141..2e60943b 100644
--- a/chaos-at-home/ch-atlas.yml
+++ b/chaos-at-home/ch-atlas.yml
@@ -4,7 +4,8 @@
   roles:
   - role: core/sshd
   - role: core/zsh
-  - role: vm/host
+  - role: vm/host/base
+  - role: vm/host/network
   ## gpg on this host is too old to open the keyrings.
   ## to work around this problem the files have been manually converted
   ## applying the role would break this again!!
diff --git a/chaos-at-home/ch-gnocchi.yml b/chaos-at-home/ch-gnocchi.yml
index fd519bfd..095948ad 100644
--- a/chaos-at-home/ch-gnocchi.yml
+++ b/chaos-at-home/ch-gnocchi.yml
@@ -7,32 +7,7 @@
   - role: core/sshd
   - role: core/zsh
   - role: core/cpu-microcode
-  - role: vm/host
+  - role: vm/host/base
+  - role: vm/host/network
   - role: installer/debian/base
   - role: installer/openbsd/base
-  post_tasks:
-  # you need to reboot for changes to take effect
-  - name: install network interface config
-    copy:
-      dest: /etc/network/interfaces
-      content: |
-        # 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 interface in (__vmhost_bridge_interface_zones__.keys() | sort) %}
-
-
-        auto {{ interface }}
-        iface {{ interface }} inet manual
-        {%   for zone in __vmhost_bridge_interface_zones__[interface] %}
-
-        auto {{ interface }}.{{ network_zones[zone].vlan }}
-        iface {{ interface }}.{{ network_zones[zone].vlan }} inet manual
-        {%   endfor %}
-        {% endfor %}
-
-
-        source /etc/network/interfaces.d/*
diff --git a/chaos-at-home/ch-oulu.yml b/chaos-at-home/ch-oulu.yml
new file mode 100644
index 00000000..ef508629
--- /dev/null
+++ b/chaos-at-home/ch-oulu.yml
@@ -0,0 +1,11 @@
+---
+- name: Basic Setup
+  hosts: ch-oulu
+  roles:
+  - role: apt-repo/base
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
+  - role: core/cpu-microcode
+  - role: vm/host/base
+  - role: vm/host/network