From cc55ea043797cf94ac2c90b93f067ab343164209 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 29 Aug 2019 19:05:36 +0200
Subject: [PATCH] prepare priv24

---
 contact.md.asc                         | 72 +++++++++++++-------------
 salt-pillar/dhcp/init.sls              | 12 +++++
 salt-pillar/lxc-containers/server1.sls | 11 ++++
 salt-pillar/switches/init.sls          | 10 +++-
 4 files changed, 67 insertions(+), 38 deletions(-)

diff --git a/contact.md.asc b/contact.md.asc
index 5fae926..206c462 100644
--- a/contact.md.asc
+++ b/contact.md.asc
@@ -1,39 +1,39 @@
 -----BEGIN PGP MESSAGE-----
 
-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
-+LKaicH03U0=
-=oMqO
+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
+=MO8p
 -----END PGP MESSAGE-----
diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls
index c3bb49b..4da3f63 100644
--- a/salt-pillar/dhcp/init.sls
+++ b/salt-pillar/dhcp/init.sls
@@ -301,6 +301,18 @@ dhcp:
     string-opts:
       domain-name: priv23.zentralwerk.org
 
+  priv24:
+    start: 172.20.74.242
+    end: 172.20.74.254
+    time: 120
+    max-time: 86400
+    opts:
+      domain-name-servers: "172.20.73.8, 172.20.72.10, 172.20.72.6, 9.9.9.9"
+    host-opts:
+      routers: priv24-gw.priv24
+    string-opts:
+      domain-name: priv24.zentralwerk.org
+
   radio:
     start: 172.20.73.130
     end: 172.20.73.190
diff --git a/salt-pillar/lxc-containers/server1.sls b/salt-pillar/lxc-containers/server1.sls
index 7254b5b..4fcffe9 100644
--- a/salt-pillar/lxc-containers/server1.sls
+++ b/salt-pillar/lxc-containers/server1.sls
@@ -274,6 +274,17 @@ containers:
         type: phys
         hwaddr: 0A:14:48:01:2A:23
 
+  priv24-gw:
+    interfaces:
+      core:
+        type: veth
+        gw: anon1
+        gw6: upstream2
+        hwaddr: 0A:14:48:01:2A:26
+      priv24:
+        type: phys
+        hwaddr: 0A:14:48:01:2A:27
+
   upstream1:
     interfaces:
       core:
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index 9151461..579a411 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -44,6 +44,7 @@ switches:
           - priv19
           - priv22
           - priv23
+          - priv24
       mgmt:
         mode: access
         ports:
@@ -173,6 +174,7 @@ switches:
           - priv21
           - priv22
           - priv23
+          - priv24
       c3d2-server4:
         mode: bond
         ports:
@@ -311,6 +313,7 @@ switches:
           - priv19
           - priv22
           - priv23
+          - priv24
       mgmt:
         mode: access
         ports:
@@ -383,8 +386,6 @@ switches:
         mode: access
         ports:
           - GigabitEthernet 1/0/11
-          - GigabitEthernet 1/0/14
-          - GigabitEthernet 1/0/16
           - GigabitEthernet 1/0/19
           - GigabitEthernet 1/0/20
           - GigabitEthernet 1/0/24
@@ -481,6 +482,11 @@ switches:
           - mgmt
           - pub
           - priv22
+      priv24:
+        mode: access
+        ports:
+          - GigabitEthernet 1/0/14
+          - GigabitEthernet 1/0/16
     password: |
       -----BEGIN PGP MESSAGE-----