1 files changed, 4 insertions, 64 deletions
diff --git a/inventory/host_vars/ch-gnocchi.yml b/inventory/host_vars/ch-gnocchi.yml
index a6452c12..c52a1cf4 100644
--- a/inventory/host_vars/ch-gnocchi.yml
+++ b/inventory/host_vars/ch-gnocchi.yml
@@ -9,7 +9,10 @@ install:
     - console=ttyS0,115200n8
 
 network:
-  domain: spreadspace.org
+  domain: "{{ host_domain }}"
+  interfaces:
+  - name: br-mgmt
+    address: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
 
 
 apt_repo_components:
@@ -23,66 +26,3 @@ installer_lvm:
   lv: installer
   size: 10G
   fs: ext4
-
-
-
-__interface_zones__:
-  enp1s0:
-    - lan
-    - svc
-  enp2s0:
-    - magenta
-  enp3s0:
-    - name: mgmt
-      prefix: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) }}"
-    - iot
-
-
-__interface_zones_yaml__: |
-  {% for interface in (__interface_zones__.keys() | sort) %}
-  {%   for zone in __interface_zones__[interface] %}
-  {%     if zone is mapping %}
-  {{ zone.name }}:
-    interfaces:
-      - {{ interface }}.{{ network_zones[zone.name].vlan }}
-    prefix: {{ zone.prefix }}
-  {%     else %}
-  {{ zone }}:
-    interfaces:
-      - {{ interface }}.{{ network_zones[zone].vlan }}
-  {%     endif %}
-  {%   endfor %}
-  {% endfor %}
-
-
-vm_host:
-  network:
-    bridges: "{{ __interface_zones_yaml__ | from_yaml }}"
-
-
-__interface_configs__: |
-  # 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 (__interface_zones__.keys() | sort) %}
-
-
-  auto {{ interface }}
-  iface {{ interface }} inet manual
-  {%   for zone in __interface_zones__[interface] %}
-
-  {%     if zone is mapping %}
-  auto {{ interface }}.{{ network_zones[zone.name].vlan }}
-  iface {{ interface }}.{{ network_zones[zone.name].vlan }} inet manual
-  {%     else %}
-  auto {{ interface }}.{{ network_zones[zone].vlan }}
-  iface {{ interface }}.{{ network_zones[zone].vlan }} inet manual
-  {%     endif %}
-  {%   endfor %}
-  {% endfor %}
-
-
-  source /etc/network/interfaces.d/*