From 1c22c411175c6cac548b5ac5d051f498570c9bc1 Mon Sep 17 00:00:00 2001
From: Daniel Poelzleithner <git@poelzi.org>
Date: Thu, 18 Jul 2019 00:31:20 +0200
Subject: [PATCH] add server3-7 to core/mgmt network add priv23

---
 salt-pillar/bind/dns.sls      |  2 +-
 salt-pillar/hosts/init.sls    | 10 ++++++++++
 salt-pillar/switches/init.sls | 32 ++++++++++++++++++++++++++++----
 salt-pillar/vlans/init.sls    |  1 +
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/salt-pillar/bind/dns.sls b/salt-pillar/bind/dns.sls
index 59e990b..d20e881 100644
--- a/salt-pillar/bind/dns.sls
+++ b/salt-pillar/bind/dns.sls
@@ -17,7 +17,7 @@ bind:
     # dns.spaceboyz.net
     - 172.22.24.4
     - 2a01:4f8:a0:33d0::4
-  serial: 2019070301
+  serial: 2019071701
   
   reverse-zones-inet:
     - 72.20.172.in-addr.arpa
diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls
index 4138cb9..3f8bf0c 100644
--- a/salt-pillar/hosts/init.sls
+++ b/salt-pillar/hosts/init.sls
@@ -2,6 +2,11 @@ hosts-inet:
   mgmt:
     server1: 10.0.0.1
     server2: 10.0.0.2
+    server3: 10.0.0.3
+    server4: 10.0.0.4
+    server5: 10.0.0.5
+    server6: 10.0.0.6
+    server7: 10.0.0.7
     switch-b1: 10.0.0.10
     switch-b2: 10.0.0.11
     switch-c1: 10.0.0.12
@@ -78,6 +83,11 @@ hosts-inet:
   core:
     server1: 172.20.72.1
     server2: 172.20.72.102
+    server3: 172.20.72.103
+    server4: 172.20.72.104
+    server5: 172.20.72.105
+    server6: 172.20.72.106
+    server7: 172.20.72.107
     serv-gw: 172.20.72.2
     pub-gw: 172.20.72.3
     priv1-gw: 172.20.72.4
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 7e938f4..6f474a3 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -41,6 +41,7 @@ switches:
           - priv17
           - priv18
           - priv19
+          - priv23
       mgmt:
         mode: access
         ports:
@@ -165,6 +166,7 @@ switches:
           - priv19
           - priv20
           - priv21
+          - priv23
       c3d2-server4:
         mode: bond
         ports:
@@ -172,24 +174,39 @@ switches:
           - GigabitEthernet1/0/39
           - GigabitEthernet1/0/40
         vlans:
-          - c3d2
+          - mgmt
+          - pub
+          - core
           - serv
+          - c3d2
+          - radio
+          - priv23
       c3d2-server5:
         mode: bond
         ports:
           - GigabitEthernet1/0/5
           - GigabitEthernet1/0/6
         vlans:
-          - c3d2
+          - mgmt
+          - pub
+          - core
           - serv
+          - c3d2
+          - radio
+          - priv23
       c3d2-server6:
         mode: bond
         ports:
           - GigabitEthernet1/0/7
           - GigabitEthernet1/0/8
         vlans:
-          - c3d2
+          - mgmt
+          - pub
+          - core
           - serv
+          - c3d2
+          - radio
+          - priv23
       c3d2-server7:
         mode: trunk
         ports:
@@ -282,6 +299,7 @@ switches:
           - priv17
           - priv18
           - priv19
+          - priv23
       mgmt:
         mode: access
         ports:
@@ -378,8 +396,12 @@ switches:
           - GigabitEthernet1/0/30
           - GigabitEthernet1/0/31
         vlans:
-          - c3d2
+          - mgmt
+          - pub
+          - core
           - serv
+          - c3d2
+          - radio
       ap24:
         mode: trunk
         ports:
@@ -496,6 +518,7 @@ switches:
           - iso16
           - priv7
           - priv20
+          - priv23
       up1:
         mode: access
         ports: '1'
@@ -571,6 +594,7 @@ switches:
           - mgmt
           - pub
           - c3d2
+          - priv23
       ap38:
         mode: trunk
         ports: 7
diff --git a/salt-pillar/vlans/init.sls b/salt-pillar/vlans/init.sls
index cfe985b..6e4b374 100644
--- a/salt-pillar/vlans/init.sls
+++ b/salt-pillar/vlans/init.sls
@@ -44,6 +44,7 @@ vlans:
   priv22: 61
   priv23: 62
   priv24: 63
+  priv25: 64
   # Isolated neighbors directly connection with their modems
   iso1: 101
   iso2: 102