From 07efe1620defc1de008ad600142b578357b9f940 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 23 Nov 2016 01:11:32 +0100
Subject: [PATCH] rewire lxc-containers to 100% bridging

---
 salt-pillar/hosts/init.sls             |  4 ++++
 salt-pillar/lxc-containers/server1.sls | 10 +++++-----
 salt/server1-network.sls               | 11 +++++++++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls
index 008506a..bfe7cba 100644
--- a/salt-pillar/hosts/init.sls
+++ b/salt-pillar/hosts/init.sls
@@ -18,3 +18,7 @@ hosts-inet:
     pub-gw: 172.20.76.1
   serv:
     serv-gw: 172.20.73.1
+  priv1:
+    priv1-gw: 172.20.74.1
+  priv2:
+    priv2-gw: 172.20.75.1
diff --git a/salt-pillar/lxc-containers/server1.sls b/salt-pillar/lxc-containers/server1.sls
index 43b6f9e..b1f10e0 100644
--- a/salt-pillar/lxc-containers/server1.sls
+++ b/salt-pillar/lxc-containers/server1.sls
@@ -5,7 +5,7 @@ containers:
         type: veth
         gw: anon1
       pub:
-        type: phys
+        type: veth
 
   serv-gw:
     interfaces:
@@ -21,7 +21,7 @@ containers:
         type: veth
         gw: upstream1
       priv1:
-        type: phys
+        type: veth
 
   priv2-gw:
     interfaces:
@@ -29,21 +29,21 @@ containers:
         type: veth
         gw: upstream2
       priv2:
-        type: phys
+        type: veth
 
   upstream1:
     interfaces:
       core:
         type: veth
       up1:
-        type: phys
+        type: veth
 
   upstream2:
     interfaces:
       core:
         type: veth
       up2:
-        type: phys
+        type: veth
 
   anon1:
     interfaces:
diff --git a/salt/server1-network.sls b/salt/server1-network.sls
index ece0471..ed74027 100644
--- a/salt/server1-network.sls
+++ b/salt/server1-network.sls
@@ -39,14 +39,19 @@ bond0.{{ vlan }}:
         - network: bond0
 {% endfor %}
 
-{%- for net in ['core', 'serv', 'mgmt'] %}
+{%- set nets = ['mgmt', 'core', 'serv', 'pub'] %}
+{%- for i in range(1, 9) %}
+{%-   set nets_ = nets.append('priv' ~ i) %}
+{%-   set nets_ = nets.append('up' ~ i) %}
+{%- endfor %}
+{%- for net in nets %}
 {%- set vlan = pillar['vlans'][net] %}
 br-{{ net }}:
   network.managed:
     - type: bridge
       ports: bond0.{{ vlan }}
       delay: 0
-{%- set ip_addr = pillar['hosts-inet'][net].get('server1') %}
+{%- set ip_addr = pillar['hosts-inet'].get(net) and pillar['hosts-inet'][net].get('server1') %}
 {%- if ip_addr %}
 {%- set prefix_len = pillar['subnets-inet'][net].split('/')[1] %}
       proto: static
@@ -57,6 +62,8 @@ br-{{ net }}:
 {%- endif %}
 {%- else %}
       proto: manual
+      ipv6_autoconf: no
+      enable_ipv6: false
 {%- endif %}
       use:
         - network: bond0.{{ vlan }}