From cc20ec8572aa7df3712b3e6aa85e76c8d44745bd Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 4 Jun 2019 21:41:20 +0200
Subject: [PATCH] hosts, subnets: split up core for up1+up2

---
 salt-pillar/hosts/init.sls   | 62 +++++++++++++++++++-----------------
 salt-pillar/subnets/init.sls |  1 +
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls
index 6f469f7..795aeed 100644
--- a/salt-pillar/hosts/init.sls
+++ b/salt-pillar/hosts/init.sls
@@ -450,41 +450,12 @@ hosts-inet6:
 
       anon1: 2a02:8106:208:5281::9:1
       serv-gw: 2a02:8106:208:5281::8:1
-      pub-gw: 2a02:8106:208:5281::8:2
       c3d2-gw: 2a02:8106:208:5281::c3d2:1
       c3d2-anon: 2a02:8106:208:5281::c3d2:a
       bgp: 2a02:8106:208:5281::c3d2:b
       mgmt-gw: 2a02:8106:208:5281::8:3
 
       upstream1: 2a02:8106:208:5281::b:0
-      upstream2: 2a02:8106:208:5281::b:1
-      upstream3: 2a02:8106:208:5281::b:2
-      upstream4: 2a02:8106:208:5281::b:3
-
-      priv1-gw: 2a02:8106:208:5281::c:0
-      priv2-gw: 2a02:8106:208:5281::c:1
-      priv3-gw: 2a02:8106:208:5281::c:2
-      priv4-gw: 2a02:8106:208:5281::c:3
-      priv5-gw: 2a02:8106:208:5281::c:4
-      priv6-gw: 2a02:8106:208:5281::c:5
-      priv7-gw: 2a02:8106:208:5281::c:6
-      priv8-gw: 2a02:8106:208:5281::c:7
-      priv9-gw: 2a02:8106:208:5281::c:8
-      priv10-gw: 2a02:8106:208:5281::c:9
-      priv11-gw: 2a02:8106:208:5281::c:a
-      priv12-gw: 2a02:8106:208:5281::c:b
-      priv13-gw: 2a02:8106:208:5281::c:c
-      priv14-gw: 2a02:8106:208:5281::c:d
-      priv15-gw: 2a02:8106:208:5281::c:e
-      priv16-gw: 2a02:8106:208:5281::c:f
-      priv17-gw: 2a02:8106:208:5281::c:10
-      priv18-gw: 2a02:8106:208:5281::c:11
-      priv19-gw: 2a02:8106:208:5281::c:12
-      priv20-gw: 2a02:8106:208:5281::c:13
-      priv21-gw: 2a02:8106:208:5281::c:14
-      priv22-gw: 2a02:8106:208:5281::c:15
-      priv23-gw: 2a02:8106:208:5281::c:16
-      priv24-gw: 2a02:8106:208:5281::c:17
 
     serv:
       serv-gw: 2a02:8106:208:5282::1
@@ -499,6 +470,39 @@ hosts-inet6:
       bgp: 2a02:8106:208:5201::c3d2:ff0b
 
   up2:
+    core:
+      server1: 2a02:8106:211:e981::1
+      server2: 2a02:8106:211:e981::102
+
+      pub-gw: 2a02:8106:211:e981::8:2
+
+      upstream2: 2a02:8106:211:e981::b:1
+
+      priv1-gw: 2a02:8106:211:e981::c:0
+      priv2-gw: 2a02:8106:211:e981::c:1
+      priv3-gw: 2a02:8106:211:e981::c:2
+      priv4-gw: 2a02:8106:211:e981::c:3
+      priv5-gw: 2a02:8106:211:e981::c:4
+      priv6-gw: 2a02:8106:211:e981::c:5
+      priv7-gw: 2a02:8106:211:e981::c:6
+      priv8-gw: 2a02:8106:211:e981::c:7
+      priv9-gw: 2a02:8106:211:e981::c:8
+      priv10-gw: 2a02:8106:211:e981::c:9
+      priv11-gw: 2a02:8106:211:e981::c:a
+      priv12-gw: 2a02:8106:211:e981::c:b
+      priv13-gw: 2a02:8106:211:e981::c:c
+      priv14-gw: 2a02:8106:211:e981::c:d
+      priv15-gw: 2a02:8106:211:e981::c:e
+      priv16-gw: 2a02:8106:211:e981::c:f
+      priv17-gw: 2a02:8106:211:e981::c:10
+      priv18-gw: 2a02:8106:211:e981::c:11
+      priv19-gw: 2a02:8106:211:e981::c:12
+      priv20-gw: 2a02:8106:211:e981::c:13
+      priv21-gw: 2a02:8106:211:e981::c:14
+      priv22-gw: 2a02:8106:211:e981::c:15
+      priv23-gw: 2a02:8106:211:e981::c:16
+      priv24-gw: 2a02:8106:211:e981::c:17
+
     pub:
       pub-gw: 2a02:8106:211:e983::1
     radio:
diff --git a/salt-pillar/subnets/init.sls b/salt-pillar/subnets/init.sls
index 41cc57a..25a9df7 100644
--- a/salt-pillar/subnets/init.sls
+++ b/salt-pillar/subnets/init.sls
@@ -68,6 +68,7 @@ subnets-inet6:
     core: 2a02:8106:208:5281::/64
     serv: 2a02:8106:208:5282::/64
   up2:
+    core: 2a02:8106:211:e981::/64
     pub: 2a02:8106:211:e983::/64
     radio: 2a02:8106:211:e986::/64
     priv1: 2a02:8106:211:e9c0::/64