From b5eaa4a862c5465ad190e8af890caa4e5ec6efa3 Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 15 Sep 2019 23:51:10 +0200 Subject: [PATCH] prepare priv25 --- contact.md.asc | 72 +++++++++++++------------- salt-pillar/dhcp/init.sls | 12 +++++ salt-pillar/lxc-containers/server1.sls | 11 ++++ salt-pillar/switches/init.sls | 29 +++++++---- 4 files changed, 77 insertions(+), 47 deletions(-) diff --git a/contact.md.asc b/contact.md.asc index 206c462..48caee9 100644 --- a/contact.md.asc +++ b/contact.md.asc @@ -1,39 +1,39 @@ -----BEGIN PGP MESSAGE----- -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 -=MO8p +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 +=9WQB -----END PGP MESSAGE----- diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls index 4da3f63..e633837 100644 --- a/salt-pillar/dhcp/init.sls +++ b/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 diff --git a/salt-pillar/lxc-containers/server1.sls b/salt-pillar/lxc-containers/server1.sls index 4fcffe9..a49f7e9 100644 --- a/salt-pillar/lxc-containers/server1.sls +++ b/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: diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls index 579a411..72c58b7 100644 --- a/salt-pillar/switches/init.sls +++ b/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 - priv7: + - priv25 + 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-----