From dc19d1a1f27f441bb73c9a2b5f39406109858d91 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 11 Dec 2016 03:11:20 +0100
Subject: [PATCH] server1-network: remove unneeded up/priv bridges

---
 salt/server1-network.sls | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/salt/server1-network.sls b/salt/server1-network.sls
index 0e81496..09d577e 100644
--- a/salt/server1-network.sls
+++ b/salt/server1-network.sls
@@ -37,12 +37,8 @@ bond0.{{ vlan }}:
         - network: bond0
 {% endfor %}
 
-{%- 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 bridge_nets = ['mgmt', 'core', 'serv', 'pub'] %}
+{%- for net in bridge_nets %}
 {%- set vlan = pillar['vlans'][net] %}
 br-{{ net }}:
   network.managed:
@@ -69,4 +65,3 @@ br-{{ net }}:
       require:
         - network: bond0.{{ vlan}}
 {%- endfor %}
-