prepare for more priv nets

note that only configuration in salt-pillar/ has to be touched, no
additional scripting necessary!
This commit is contained in:
Astro 2016-12-14 23:09:57 +01:00
parent 14d6d9ac15
commit 0e50ec3a1b
3 changed files with 109 additions and 0 deletions

View File

@ -37,6 +37,7 @@ hosts-inet:
ap30: 10.0.0.70
ap31: 10.0.0.71
ap32: 10.0.0.72
core:
server1: 172.20.72.1
serv-gw: 172.20.72.2
@ -48,14 +49,60 @@ hosts-inet:
c3d2-gw: 172.20.72.8
c3d2-anon: 172.20.72.9
upstream2: 172.20.72.10
upstream3: 172.20.72.11
upstream4: 172.20.72.12
priv3-gw: 172.20.72.13
priv4-gw: 172.20.72.14
priv5-gw: 172.20.72.15
priv6-gw: 172.20.72.16
priv7-gw: 172.20.72.17
priv8-gw: 172.20.72.18
priv9-gw: 172.20.72.19
priv10-gw: 172.20.72.20
priv11-gw: 172.20.72.21
priv12-gw: 172.20.72.22
priv13-gw: 172.20.72.23
priv14-gw: 172.20.72.24
priv15-gw: 172.20.72.25
priv16-gw: 172.20.72.26
pub:
pub-gw: 172.20.76.1
serv:
serv-gw: 172.20.73.1
priv1:
priv1-gw: 172.20.74.1
priv9:
priv9-gw: 172.20.74.33
priv5:
priv5-gw: 172.20.74.65
priv10:
priv10-gw: 172.20.74.97
priv3:
priv3-gw: 172.20.74.129
priv11:
priv11-gw: 172.20.74.161
priv6:
priv6-gw: 172.20.74.193
priv12:
priv12-gw: 172.20.74.225
priv2:
priv2-gw: 172.20.75.1
priv13:
priv13-gw: 172.20.75.33
priv7:
priv7-gw: 172.20.75.65
priv14:
priv14-gw: 172.20.75.97
priv4:
priv4-gw: 172.20.75.129
priv15:
priv15-gw: 172.20.75.161
priv8:
priv8-gw: 172.20.75.193
priv16:
priv16-gw: 172.20.75.225
c3d2:
c3d2-anon: 172.22.99.1
c3d2-gw: 172.22.99.4

View File

@ -31,6 +31,54 @@ containers:
priv2:
type: phys
priv3-gw:
interfaces:
core:
type: veth
gw: anon1
priv3:
type: phys
priv4-gw:
interfaces:
core:
type: veth
gw: anon1
priv4:
type: phys
priv5-gw:
interfaces:
core:
type: veth
gw: anon1
priv5:
type: phys
priv6-gw:
interfaces:
core:
type: veth
gw: anon1
priv6:
type: phys
priv7-gw:
interfaces:
core:
type: veth
gw: anon1
priv7:
type: phys
priv8-gw:
interfaces:
core:
type: veth
gw: anon1
priv8:
type: phys
upstream1:
interfaces:
core:

View File

@ -3,6 +3,20 @@ subnets-inet:
serv: 172.20.73.0/26
pub: 172.20.76.0/23
priv1: 172.20.74.0/28
priv9: 172.20.74.32/28
priv5: 172.20.74.64/28
priv10: 172.20.74.96/28
priv3: 172.20.74.128/28
priv11: 172.20.74.160/28
priv6: 172.20.74.192/28
priv12: 172.20.74.224/28
priv2: 172.20.75.0/28
priv13: 172.20.75.32/28
priv7: 172.20.75.64/28
priv14: 172.20.75.96/28
priv4: 172.20.75.128/28
priv15: 172.20.75.160/28
priv8: 172.20.75.192/28
priv16: 172.20.75.224/28
c3d2: 172.22.99.0/24
mgmt: 10.0.0.0/24