From 34fd4ee758e8a6deefe9c44046a499f89e97190b Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 29 Mar 2018 16:31:25 +0200 Subject: [PATCH] plug ap24 + ap25 into switch-b2 --- cabling.md | 4 +-- contact.md.asc | 61 ++++++++++++++++++----------------- salt-pillar/switches/init.sls | 16 +++++++++ 3 files changed, 49 insertions(+), 32 deletions(-) diff --git a/cabling.md b/cabling.md index b4ee6a0..8264d8a 100644 --- a/cabling.md +++ b/cabling.md @@ -8,8 +8,8 @@ | --------------------- | --------------------- | ------------------------- | --------------------- | ----- | | ![][ri] B 3.01.01 | ![][gi] B 2.01.01 | ![][yi] UVB 1.01 | ![][gi] Brücke Ost 1 | 01 | | ![][ri] B 3.02.01 | ![][gi] B 2.02.01 | ![][yi] UVB 1.02 | ![][gi] Brücke Ost 2 | 02 | -| ![][ri] B 3.03.02 | ![][gi] B 2.03.02 | ![][gi] UVB 1.03 | ![][gi] Brücke Ost 3 | 03 | -| ![][ri] B 3.04.02 | ![][gi] B 2.03.05 | ![][gi] Antenne? | ![][gi] Brücke Ost 4 | 04 | +| ![][ri] B 3.03.02 | ![][gi] B 2.03.02 | ![][gi] B 1.03.03 *v* | ![][gi] Brücke Ost 3 | 03 | +| ![][ri] B 3.04.02 | ![][gi] B 2.03.05 | ![][gi] B 1.05.05 *v* | ![][gi] Brücke Ost 4 | 04 | | ![][ri] B 3.05.03 | ![][ri] B 2.03.03 (1) | ![][yi] B 1.06 | ![][gi] Brücke West 1 | 05 | | ![][ri] B 3.05.02 | ![][ri] B 2.03.03 (2) | ![][yi] B 1.04.01 (1) *v* | ![][gi] Brücke West 2 | 06 | | ![][ri] B 3.06.02 *v* | ![][ri] B 2.03.03 (3) | ![][yi] B 1.04.01 (2) *v* | ![][gi] Brücke West 3 | 07 | diff --git a/contact.md.asc b/contact.md.asc index ba18db5..d22e3e5 100644 --- a/contact.md.asc +++ b/contact.md.asc @@ -1,33 +1,34 @@ -----BEGIN PGP MESSAGE----- -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 +hQEMA2PKcvDMvlKLAQgAiNECo95Mmwi3WBSaBUEe8HeDy8cHoY/qhLqc60yV/ssO +McNkm3IPIqT7b7suw5J2pGaod6SWwmw7CJCD7HHJZPA9qQDzeMpSqKhrIeFvnbtr +bNsVkm3sXolklzg6dUegRwtrHd0ru9OZ31x4JI7kW8hGBjVf/EVu5/yyaYeXH2k5 +QhpXXEJTOXE4CegGguNR6PKrX2JMpvt3RUeMbG9KElhqGWEGE5Qsr4KHoeDzKKXx +cM/9d8i1yNzkx6sZBNL6GEDf/N4Ztx8TlXVfjG3sWQ2mwcdxfIAgVC3RuYZI/NH6 +0uzpyeUL5ZMlrT0kMGC6XYTmdwfUrDi2czMfMIK0a9LqAaRMtVgkexgtTgjH7fKj +tmBQ7fO5F+7bjaXkqEHzEJ8P4xNoc5xtDqrtbFbFOy/GqictaWkCubeaO6uBhTeE +y88HSnt80US/VEGkWdD+DGxMZX6Y1VzcbI+pZ1jxjxT0CI2hOMTbFGoxxUtP1Qjt +dczK8jUbqLgMjpWoDS7dkdnraNuysuJrMM0BzIG1J3Zpax0jGyEjTAmWPzbpidnm +ehOnOEjUY+Id7I1Kw9vQ+6N5qmIZdJFYCfiYTA/eSxq8xlqXzi2okPySOVIjCbtR +9TicMISY4nZxjBQIPEV5mm7jE03fSnjgeZ6LfxWvCofEhowJN53cb1zxypmLFizc +pKNxh63ZlP9UuCDQ35FuUWTfb9ajqTYTnN+XgXcZdJkCaL9+qsZKdhx3RlIYNIaK +15FZxzL0jVyqWClCFVxDJPRIRBHk6DJ/Qy/8Yi+rXAH7Wjw9umWK/88j+0zNJBwq +TIP1RMWt7t+s7aiHn15ClGdTtXOcxH2gwopDWOu857469RzTd8PDFgK0m5IbeTLg +sZu6qyBLpHcZAHZXgUzTchgNhAWXcVNgsCOvFybQKGv+QBtnNsLaKPf1x01SJGOM +wc20ERMpv1gomqeKtBvRxPe25Zg+DN2Kyi4ees3B5U2c7uQfdmkX4yHjUd42XJu4 +PBdocur153cVQD/GskOiQCkqPsm9xGLgKb3yBDpt5WpoihMT3BJmDMOIH95IVx+R +l9uyFH0jntN4fhDaAOOKOg5oWe6frmImPsylsq0nBInNe7+PXW6kwXzolw6K/j+T +fbzmbuoPXxlLdYGC8zE2kThIlUuzoswZQFTVJ2x4KbBDjO/94ksIaZz32TC2zRwf +t8GpHyha9n9TYlplgZLXWC1PpwW9manxqIR02NAiC5RqBViRaFNuL8hsYKYWU9eD +r2zXL6Mp6V+Sqdz841ODl02HRlF+tzoc40jvVQ6ecHxrz3zYGfayzukfBjbfdUYO +doOf/nqJ2qyVvtyp1t19cIzfQJqBAvh0lIXAjDfuXeK2w1/WnBziIoeKJ0lFuGUg +nz6ygW83ST21cpifBlnGa6P4obVB5bwrtCtzTe+sK43ZPafPH67EBjSSeAg3juJN +Tms9+AoOFmjnd5JB/B+CsWZ4HX1EUoy5jte6UcmzhFHwVgbLS6+Xh7q8maPUwAGY +0WnSMKrMjzzc93+d9DgV+/eEGhp48K8A9ALQBZJrMCqlzKGUp2am3BpT/97QGQQ0 +UuKny47N2yEfoUsYF6NmrqzJRrwOh4ZZrJvPM225K6xJPRL6hInDmSj2tJ5YxKFA +oK+t+M1HAbwDnwbIlcV5wzwJINKs9jn4rQVQt+ppNntfhrvqZsFlEP1LZMTN0r9O +/HBeYuxeFfa2LGZF1Iz1wuAWui5MoMAS1e0bPll9tAl6xJjqLZogjkCy7Mjtb3vN +C/MG+svJsMt0cckuYLlC5asxWex/aU73cy3ExMSZVmSuciicmMJHJeNrIDwT4s3v +5d3Fm7JmGOkIn61L0ULEufsZ +=4B2l -----END PGP MESSAGE----- diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls index dd77f54..573ef5a 100644 --- a/salt-pillar/switches/init.sls +++ b/salt-pillar/switches/init.sls @@ -377,6 +377,22 @@ switches: ports: - GigabitEthernet1/0/33 access: c3d2 + ap24: + mode: trunk + ports: + - GigabitEthernet 1/0/34 + vlans: + - mgmt + - pub + - priv12 + ap25: + mode: trunk + ports: + - GigabitEthernet 1/0/35 + vlans: + - mgmt + - pub + - priv12 password: | -----BEGIN PGP MESSAGE-----