gh-gnocchi networking

1 files changed, 47 insertions, 33 deletions

diff --git a/inventory/host_vars/ch-gnocchi.yml b/inventory/host_vars/ch-gnocchi.yml
index 278ef9f4..35527e2d 100644
--- a/inventory/host_vars/ch-gnocchi.yml
+++ b/inventory/host_vars/ch-gnocchi.yml
@@ -19,50 +19,64 @@ installer_lvm:
   fs: ext4
 
 
-__interfaces__:
+
+__interface_zones__:
   enp1s0:
-    zones:
-      lan:
-        type: manual
-      svc:
-        type: manual
+    - lan
+    - svc
   enp2s0:
-    zones:
-      magenta:
-        type: manual
+    - magenta
   enp3s0:
-    zones:
-      mgmt:
-        type: static
-        address: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}"
-        netmask: "{{ network_zones.mgmt.prefix | ipaddr('netmask') }}"
-      iot:
-        type: manual
+    - name: mgmt
+      prefix: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) }}"
+    - iot
+
+
+__interface_zones_yaml__: |
+  {% for interface in __interface_zones__.keys() %}
+  {%   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__: |
-  {% for interface in __interfaces__.keys() %}
-  ##
-  ## /etc/network/interfaces.d/{{ interface }}
-  ##
+  # 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() %}
+
+
   auto {{ interface }}
   iface {{ interface }} inet manual
+  {%   for zone in __interface_zones__[interface] %}
 
-  {%   for zone in __interfaces__[interface].zones.keys() %}
-
+  {%     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
-
-  auto br-{{ zone }}
-  iface br-{{ zone }} inet {{ __interfaces__[interface].zones[zone].type }}
-    bridge_ports {{ interface }}.{{ network_zones[zone].vlan }}
-    bridge_stp off
-    bridge_waitport 0
-    bridge_fd 0
-  {%     if __interfaces__[interface].zones[zone].type == 'static' %}
-    address {{ __interfaces__[interface].zones[zone].address }}
-    netmask {{ __interfaces__[interface].zones[zone].netmask }}
   {%     endif %}
-
   {%   endfor %}
   {% endfor %}
+
+
+  source /etc/network/interfaces.d/*