prepare priv25

contact.md.asc

@@ -1,39 +1,39 @@
 -----BEGIN PGP MESSAGE-----
 
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-HoWtGSoxEZUvlNegAh6BWxm+eMmqDIm+0CwrsEb130m0CgR75qTfvj1liVRvEu1J
+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
-NDy+o7vC7VMQW4h50CLkMYVeofHEpyG8jQ1gxJc+nTCpqEVs1iPNy/1uoZWdxGtn
+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
-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
+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
-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
+S9BBWaJO7mAeoKknycBFVgpQR8zrfozIJ7KhEaQuCLG7bz4G3O0H/niDUXTIxxdu
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+3QVtYcTq+pajytnLg3hZkL7+377HfGwobSASMzRzpuAnNnD/IqCpoCxCkeuKYqu7
-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
+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
-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
++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
-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
++wyP5hVgJ9wAw2KvBUhRngBxzfG6IPgl+x60D+WCS58TqTAuCFV3L7DBVtWSmvrW
-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
+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
-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
+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
-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
+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
-eb8s3zsHBn/UTURzwRLyD2PzvN02mJIJwZkOlSqMAPBOsexit9e3QIpl/NskYLQd
+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
-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
+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
-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
+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
-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
+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
-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
+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
-=MO8p
+=9WQB
 -----END PGP MESSAGE-----

salt-pillar/dhcp/init.sls

@@ -313,6 +313,18 @@ dhcp:
     string-opts:
       domain-name: priv24.zentralwerk.org
 
+  priv25:
+    start: 172.20.74.82
+    end: 172.20.74.94
+    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: priv25-gw.priv25
+    string-opts:
+      domain-name: priv25.zentralwerk.org
+
   radio:
     start: 172.20.73.130
     end: 172.20.73.190

salt-pillar/lxc-containers/server1.sls

@@ -285,6 +285,17 @@ containers:
         type: phys
         hwaddr: 0A:14:48:01:2A:27
 
+  priv25-gw:
+    interfaces:
+      core:
+        type: veth
+        gw: upstream1
+        gw6: upstream2
+        hwaddr: 0A:14:48:01:2A:28
+      priv25:
+        type: phys
+        hwaddr: 0A:14:48:01:2A:29
+
   upstream1:
     interfaces:
       core:

salt-pillar/switches/init.sls

@@ -98,8 +98,8 @@ switches:
           - up6
           - up7
           - up8
-          - priv7
           - priv20
+          - priv25
           - iso1
           - iso2
           - iso3
@@ -175,6 +175,7 @@ switches:
           - priv22
           - priv23
           - priv24
+          - priv25
       c3d2-server4:
         mode: bond
         ports:
@@ -255,6 +256,7 @@ switches:
           - mgmt
           - pub
           - c3d2
+          - priv25
     password: |
       -----BEGIN PGP MESSAGE-----
 
@@ -541,8 +543,8 @@ switches:
           - iso14
           - iso15
           - iso16
-          - priv7
           - priv20
+          - priv25
       up1:
         mode: access
         ports: '1'
@@ -598,7 +600,7 @@ switches:
           - mgmt
           - pub
           - c3d2
-          - priv7
+          - priv25
       ap19:
         mode: trunk
         ports: 17
@@ -720,28 +722,31 @@ switches:
           - mgmt
           - pub
           - c3d2
-      ap2:
+          - priv25
+      ap-test1:
         mode: trunk
         ports: 2
         vlans:
           - mgmt
           - pub
           - c3d2
-      ap3:
+          - priv25
+      ap-test2:
         mode: trunk
         ports: 3
         vlans:
           - mgmt
           - pub
           - c3d2
-      ap31:
+          - priv25
+      ap2:
         mode: trunk
         ports: 4
         vlans:
           - mgmt
           - pub
           - c3d2
-      ap32old:
+      ap31:
         mode: trunk
         ports: 5
         vlans:
@@ -780,8 +785,8 @@ switches:
         vlans:
           - mgmt
           - pub
-          - priv7
+          - priv25
-      priv7:
+      priv25:
         mode: access
         ports:
           - 2
@@ -797,18 +802,20 @@ switches:
         vlans:
           - mgmt
           - pub
-      ap34:
+      ap-tmp1:
         mode: trunk
         ports: 5
         vlans:
           - mgmt
           - pub
-      apTODO:
+          - priv25
+      ap-tmp2:
         mode: trunk
         ports: 6
         vlans:
           - mgmt
           - pub
+          - priv25
     password: |
       -----BEGIN PGP MESSAGE-----