summaryrefslogtreecommitdiff
path: root/chaos-at-home
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-06-22 01:12:15 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-06-22 01:12:15 +0200
commitb13af9ddfd01117b350243dd1cc483a35a420611 (patch)
tree6d6faee4278235ee79fb3ee0c2a18729e5715b19 /chaos-at-home
parentmove r3-cccamp19 stuff to _graveyard_, introduce new kvm groups (diff)
all vm hosts/guests use the new network config schema
Diffstat (limited to 'chaos-at-home')
-rw-r--r--chaos-at-home/ch-gnocchi.yml22
-rw-r--r--chaos-at-home/vm-install.yml3
2 files changed, 23 insertions, 2 deletions
diff --git a/chaos-at-home/ch-gnocchi.yml b/chaos-at-home/ch-gnocchi.yml
index c3811c50..fd519bfd 100644
--- a/chaos-at-home/ch-gnocchi.yml
+++ b/chaos-at-home/ch-gnocchi.yml
@@ -15,4 +15,24 @@
- name: install network interface config
copy:
dest: /etc/network/interfaces
- content: "{{ __interface_configs__ }}"
+ 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/vm-install.yml b/chaos-at-home/vm-install.yml
index cf19d046..b6a69b67 100644
--- a/chaos-at-home/vm-install.yml
+++ b/chaos-at-home/vm-install.yml
@@ -6,9 +6,10 @@
- set_fact:
install_cooked: "{{ install }}"
network_cooked: "{{ network }}"
+ vm_host_cooked: "{{ vm_host }}"
- name: cook variables for host
- hosts: "{{ hostvars[install_hostname].install.vm.host }}"
+ hosts: "{{ hostvars[install_hostname].vm_host.name }}"
gather_facts: no
tasks:
- set_fact: