From a9640ec188de4c6f9abf75685bca9cd99f05ef3b Mon Sep 17 00:00:00 2001 From: Astro Date: Tue, 27 Mar 2018 18:09:21 +0200 Subject: [PATCH] deploy priv12 --- contact.md.asc | 60 +++++++++++++------------- salt-pillar/dhcp/init.sls | 12 ++++++ salt-pillar/lxc-containers/server1.sls | 11 +++++ 3 files changed, 53 insertions(+), 30 deletions(-) diff --git a/contact.md.asc b/contact.md.asc index 2a0aa93..ba18db5 100644 --- a/contact.md.asc +++ b/contact.md.asc @@ -1,33 +1,33 @@ -----BEGIN PGP MESSAGE----- -hQEMA2PKcvDMvlKLAQgAh2kaksrKBN2XxNVournU0YXhBBgkhZIUF8BgrA7YqNAC -rfRRjc0hCLw/e20XNIAb4E3MzqdkgMmPz3ctFJQcahL7jTK6IS7x3QEBYK0ERdT7 -+ADhAtheGQew8GQn6YaXUc916naSDRcow4zE166oEKJQ7oZbHyHIpqYkcFurgDW1 -H7JcPRiURh853cluHbpLXXTI8YGRWOXlRHODMQO8G7hEAuY8rgB8TJP7vdviSRut -BSbtjmUFsDlAwUHIqHZSrMhx32n4rAE15T90k/zWG161L+DfFfqUj5fzmTNB6E5x -jiLno/JgAJYICtB+x5dQ9qxo60a0M6H3RQqN+oaHP9LqAWqNVDe/89i3QftQO0TD -65wZGtJT/0//B6QvA9crKqHX+2kgmQuD3LNzFVJojnjrbM9B0ztfhXljd3wwLotQ -fkfEdxLYXJLhVVLyW2Y4gpHosdZdi7i7/M3YAehMyUjrD361wsurtICyGOv+rya+ -kx/VVhThhutE1+NNBYPrEpRmNrFJs8jKaNCwpDq/9+qiuhhFcJs/D4kz3hzFZT3h -b/YF5Pk06dfDjq5INLY/b/8ovjbY2W378NOo3bKUyXcbEujhY3wY51f8FEq4G4Iz -I5mjIhOnitjrmmn5+Jvi7l48YQYDwD3Z0B6m8N5y7xPx6TLYmBaaQH0vwVaWUyZz -vYcpOsFAJ91Qq2mnUjhs6PtQxehhQjJjcZJpAArV4TzyXwHU2rwKloimhJp1khU5 -Q+OIt9q3Hed6mpW3OgUeiA9cPslAUz21v+eDOwhpykc6yVuE9fwpkfD6ZHS+T+gC -OxW5ZclPnpkoHOYiMEy4hThrIBRtRgBaUMzmFhJSCoMMjQBZlrlivJ81zttz4dK4 -7VTsn5H20QQ6AF1v4TDQlWUb3Un3QbCY+QcKaLt4309OCSMDu5qWLk+pI0YR/Lfs -lMsJF0apmk0QEYNaQsKukyzoTmMm8vPDTrNQZvSin6qPh9CxGQGq6Rf1871KB/92 -3O2XTGmpZGw50MB6qR7bj79kYhAOhuIF8aNDdSr74ZNLWykT+ExvGGQ6y93K+a3L -xRsJfDhawKUBMkpa4gV+GjXTbZo0CuR0fcV0agkMLX45YXqnXKXc19Ywu+M5BbbZ -t9Q+VPmNi8NWNh+Q/DjVOphwoEFTTS3AI2xTnM7PxF7DOV2E3klE+aRHohDKH34G -b+vrzh5XzGppIdVz+JtCQ54OYFlQKfkf3eMC9J6Qbfal+T5tCFbV1R+KXa9huu6s -2gVjUBRwLL3mkfQqruvGQcm6PPro42VnDLUMzcYWV4jnsmiwGfjHYDz7Lcm4+Leq -3/DhK5rZu5RP/+0x24GJ9fJrmIVo99NUqV7WIIeXWF5IY20zOY9miRBw/NEsSNdQ -MRCXBWkduhgArpMvUgl3wocXgKT6hiL95iL0AoJAVCA0jfmJlsRuw14TBV1ThmtC -8v3t6kLctPcu2wY5W3n3bY7UXNzZ0rgEUfx2svc15GDRABjFpduUXFZeuQxuvYJI -+VhHJ2m5u9r/hhD09LhZzu1zL9Lu56NM6nbKkH94XF+3TKkSxta1H1wcmEzoU17G -REmAIrm02UXYmtyFsmWxwqNeEk405LbU204nYlYwpvT9eE2Q//bv2i0w0S0SiifO -nrqYcl5W9aJmTuYt7nKF2t52Ghge2+sxkxKCYlI0LL0vmGT+HgcJpwbJAM88u5Sv -UTUWP3Rm+n349wrv7Gcr0NZcEJENkmaW8qRHQEQa6mV+Nvr83uywNZKPqAvC3fLS -owBYvjdUIQ== -=Qi9k +hQEMA2PKcvDMvlKLAQf8COIN5unYJP0HI8MK70rS3cYXaFDJHsRdjibDFAe5AbuJ +3bTayd9njrtfkLSrp2OBiJDufJdxXGMop8zI2YCjEMQTs8nIGw52cqvaDKNeMXDv +nFtkiCIPb9fvp6BskYH5LGFYgY8YWg9djAI5h0B+plEhhXBOK5s0Do9xrN07rHLI +TBfQH9ALzXyloakbENOboOLsm15gJs4sPGgEhxTjvrYvNGynCjiL96V4bcuBP+GJ +oe6a74RjA/DDogkizRMhp7MWxaWAwQEnZTzfYogo6IHiTCdrRw3KEzDRtEKeMzcm +eqMazf5M5jBbdaVNlv5yGt4T9iBLo7qKZIlIdYilxdLqAWCagcgmzRn2pM5ghCRy +KVd8VNzuao/uUzv6+xl555NGasMtXIkvbrHA4I7zcBIcx7fqWBiNBUhnOW095XZG +1RJNUok4typBldj9/sz3FPDXlLfn/x0s6c0+0DsFTQVMm6hPuMpVfrhoD5MsRI7a +nD+G/gMz6g77g79p2I9tcMS5YUOSKWcdC/H7Pih2YAYhO7MKLvYCXHjqefDBFdjs +4a1mZzAQYYn77T6P8R42k4gkzuRUmiiZhBJ5yC1QaI2CBokX7k5p/vGDPV0L4KCo +r71j4fqcg5YVvNilSTpkXbBuLlIZBh3VAS/qnucNkPJp7T72NumOPPs/kfdrX309 +rSRFLNyrf/fxLWrTeGn1e/pqAbacnosDnohkHe+03NHPZDV5jLC4PfTXCJUADaVL +3K5HnhT1gOjEBHClPHJ4TJXm4ysuoaRHi7oqlRqOuH6YkktgEQH6iOar+ByQB+jh +Iw6qbB+iqgxPlGO58dc0lMrTW9Esi4X0kI7ZAqC9Km1UmaXf7ATyHxj3rVeTKv88 +u9XvrGi04gkofDXyI4b6GCcrcuVXSLEt8sBrRQXKMUPBNTgylkCrBS7F953AENdQ +l87tE+4MADkX7Lwa0y7YuUGPuK67ZaVE3iDulpNSmznlDziazz1FACpoA6rY+RgK +1cMcUkcz35ZdPl9VkTfvokkyslBAKeqZJqdYp6ZDcGVTgCFGmk4vbA8LRQTvUXds +6ztOdN9/YW6sHZkF3WIbWfxBI60wym+/g9wAjZgYEiSCPz7WKgH+AeHsu1kGy84e +jgGc00WzMvfHRAkD7LBRy1KjTFWUgRUMtbR6ytnvEsShgSz3O+JW3L4wfMbY/wkI +Ve/hY0OraZF8nPk6MjkrAW/gZVGsTm1qY8prK4e82PMfzruBClA1yO9UiqeN0jB0 +Uz5SKrx1TmjXOgl0u/W9aePPUzQHyvJ2WrMFzhlAHJFhmWGbpj2j3zueNcliHG5M +bF+AC/sEB4ccD/H4h31u0Z5yzFxyyiaiLQTz6R9+g7t/OTp9opAKJpse1vcG2mXY +Ng6ZtGcauPwR2fdcosBHwDZvNec4xHrHfnPJ8XbkdYdQbL0DaOS4iqj8C08vVd/N +K5g+jDo5bHlc+H+25GWCb8C4lZDbzQXIzf+LTDlLZo6PlPIAYErUWsFy2zsItm04 +8CS2pyYrmOd9oE/69793poKXqv2P6XKhrXI2UQGLASqxCweA53n9jYp6/IYlnUVY +PFXPRRWnUqDF2wGsInV6VA2+XQIUtz2kPnoyDKLM0YxmklMAoY68MIecfNMcJN+o +xO3e/AWP4E9vXPE1WOTfQooHXQbs3+5QpWioGIuJLzJ5yQSP0F526gIR9Y58+QHu +V15y7G0IyREiBkmywcOGq5V7GvUpSxSIsOB2e5TSDOBIJcznSflQh+MxnhTe7G5F +8TjvaYeaqWxk2dIm7zCPiymsxx2wJsTmvfSa5qhxAtPy+61Z0Ib8nhMS8gIEeNxO +=Y0dH -----END PGP MESSAGE----- diff --git a/salt-pillar/dhcp/init.sls b/salt-pillar/dhcp/init.sls index c828256..4c04e9d 100644 --- a/salt-pillar/dhcp/init.sls +++ b/salt-pillar/dhcp/init.sls @@ -156,6 +156,18 @@ dhcp: string-opts: domain-name: priv11.zentralwerk.online + priv12: + start: 172.20.74.226 + end: 172.20.74.238 + time: 120 + max-time: 86400 + opts: + host-opts: + routers: priv12-gw.priv12 + domain-name-servers: upstream2.core + string-opts: + domain-name: priv12.zentralwerk.online + 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 a90d898..3fe52ad 100644 --- a/salt-pillar/lxc-containers/server1.sls +++ b/salt-pillar/lxc-containers/server1.sls @@ -142,6 +142,17 @@ containers: type: phys hwaddr: 0A:14:48:01:29:01 + priv12-gw: + interfaces: + core: + type: veth + gw: anon1 + gw6: anon1 + hwaddr: 0A:14:48:01:2A:00 + priv11: + type: phys + hwaddr: 0A:14:48:01:2A:01 + upstream1: interfaces: core: