From 94cb4f6b536a8fde1a3df04a886effebea4e97c0 Mon Sep 17 00:00:00 2001
From: webzwo0i <webzwo0i@c3d2.de>
Date: Sun, 2 Apr 2017 18:41:46 +0200
Subject: [PATCH] prepare ap18 deployment

---
 contact.md.asc                | 55 ++++++++++++++++++-----------------
 salt-pillar/cpe/aps.sls       |  2 +-
 salt-pillar/switches/init.sls |  8 ++++-
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/contact.md.asc b/contact.md.asc
index 9031834..6b80288 100644
--- a/contact.md.asc
+++ b/contact.md.asc
@@ -1,30 +1,31 @@
 -----BEGIN PGP MESSAGE-----
 
-hQEMA2PKcvDMvlKLAQgAllDz583QN4RXC3Fhj8iUGDSWu4X9aPPU8JvIfQY5D0Eo
-iyNNcXafT5YTxi1QPlP4Sz1UhyAj63jQHBk5yRCzmqNRGRkWhqVeia2lM7ablX9U
-UITyMn9gw3CiXKD/YsfDd0oDW2EKrmsbCHljdLnFLUuAHVPxz1QGnV6AWZMfKsSj
-McWE2o/1+FFz/ERpauHhyePlLzkf2H7avIyr3VPhZbPR2gISBK8yLk7avTgb6QXM
-EhmNlwjajp8BZsyfZal3p/uf1b+QqTh6wNpndou9LXPjNkECL5pjkIlCj7SPG9RJ
-punXiBdPTey4sQdEABDtmQuboFkLs2wfpiKhP/2vyNLpAU6rD64ZvIWHhBWBvdK7
-MWroXjOqqvPdfCmrMycXvwpiVgJ9g/e7VSpCbmL/CYUpYWOPy0KMLsHezGxStGpZ
-hW78gvd05SSBtZvTB19D/Sy92cVTNdbwiRyDjM9X1qPsAlVGGtfySUC1RM82Bycs
-RzoCJDtOwpYAOseNXZqtQX2kSioWzBUoq3QDHLQQXWmoZZIcCwmf/yqoTHMpveaM
-1du617TKdU86i/ei1chUfSxJ1mkCMEZY30noPRw/pv0xB1jn9+Xt1HSIUVm1EFyo
-c/Wbz5IP+KFn6T4Stca39VvR6SRcWMnKBjencikRyCdmwh7O5WlWlWcPlSkna3sD
-7qUnnVMC37JMV6yqjwu9kjyFP+Btakrv+cXOI3Dx8pFkXBzmdbPjQt4+XgfVvAhn
-hB71GfbH6ssXICOIWE/NF28blm43VU+B7v/xg8s5Luzt6NBitb9Ip/2DzYMvi7h9
-DIGCIoYyCxrPzhkUVhnfgMR4SrBgPz6MnNJXKLt1vGgHj0ID9CxVuZD6rfExokjq
-stiJyeC10vv9rXtumlf7m6XnPpv/ulNULkw5YlJXiaqGLAucOH9Jowv3Mgor88dC
-jYJRcecyH5t0AVIIKeu8+dp+qxUjqOaFXEf5IlNW5lHstRGs9aPr1cHalkzuuNU1
-R0abzTMkXZylB4M3hxu7Jx/A9Tat5gFPE21mDwM6Qkjx+sC0D/8lyK3SmLs3qJch
-Q8IUL8e7oCQfI7yf3hWdJMhFG3qLTAfO64knO+vOoJwPGjL21FfDcmZbVCkg4cWi
-vhcQc13Iq5cXg/7QyViOUJI/1AMK6gvx5/QmHv7rwRks/xEaC8xxH4IWEV80EaxR
-uc1ys3oLe79DsmTZKeCIKS3Z8Pjgs9MvvkpFjltG2fyeFr9pb8lJ5TAHJtYz1b/Q
-nVjspOIOtH4A3xZ7EgGOY0S8ecP/UiC7i/DGtXsVm2+IZc1cj6d0ZCQBmd8Up8K7
-GIHbE5lrIX0UzeaW4VHwIp8oSgWkq/XyZzQPAalousN/4MEDeaN/fn4VyM3iFDzz
-EvHgDMOqIuApEoItIdcg2JiC1VrbT63Qn1CyAhiqKP7qPsMZSgDQjZM8yWJIFlgI
-yjqDKf3EV1/OU4jJ6t9pHaRgXu3Tn8pyl/11QhuO4HB+1XeiA4zHjBIt2zSVg7iW
-svJDUmK4QdJL4YSU48aNVQbF0O1YNQ76OaYWSn2AGgcdhi8x/28yWRLY2aqwjrah
-+Drly3bEcpJQIyzcUcrWWLuD97B3tjCN
-=TSQJ
+hQEMA2PKcvDMvlKLAQf/SDn+Csw/NiyDmM9soXkjTnGDcknYQyVU2+36FN+7TcUp
+8pPqmGWkOp6b6d66Ej44D7WmZ7Vm1VGON+tvuQUI+haDV3A55g9j77dER0NiKKjk
+o3BEMoeMfOEwbRKDAFe90GFIxH1gkI6KBEMsGVV9KMWLIV6kYhPrvsnrFo8Fu2eo
+XZv5KfNpn8Bl72Pf/OW5sIZqk5LRjCqWvBsNyUh0VDoWDqz5s+B5HIU+6qLjt+z5
+Fc0Y//Spxh3y6TL5PedYruwV0p2ADt3gM533M3MLETaxY7Ni+e3MoEru5Eb2z6fD
+PqbprAwwEmSPpjURqCybKF20l3NiJZGqc6xw2eloiNLpAZEgEJv2eLFFTAKrkPDS
+0OY9bc5H7RxHSw4X9MhOCPdDALAaULwmM4bz1sfwWS5sVqE7TshLZ5+Z8sczeh+X
+8IKtwOaBd+QneSBTylqXA8cU1ZEUsf/iBmb9jTC+7f5gRvltyNuoOMZHImE/FxnZ
+vD5erYbOJPq7H0BwtYNIuczHXLJch4saiID9jQ4AbYmtderXXLyBwbE3CuejjnCM
+pzq+PKzPIjnYCOEarmogK3YAMeGW0/gP7WAIi38vDp3/8qBhuchrA6OkJJ5VFfPU
+KFynbvfsqpSXkjPHQux3LnU0KOzOEWjqfCi1d6Nm0EGqJ/43EzCAqyRw9xtCY1XQ
+6nvwEq4xUvuCHNgKb+INyJ007ARPxXrBJZFGhbizZ6aTL1BSo3rJQK1bOvHTQRbo
+24BnvRX2ivUm23dlOyghOFB46SqyjLslyf5qKG4wUPtbiifqBvrnqjBPD32KLa83
+jZNeWSPPViFnw4VwOX+2gfAqscXCRv25W/Wc2YQxNY5nf+1mXvOIRbek640vNjDW
+AfmfY4H432xCk21RNyg+qzhLJojEFViYlW8bfKuEbeMbh0TWLsR4CiBJoEzeKCFm
+r3Z5WsTMvZymeM5AMJTrIhkb5jyDAqgNZp2WCMtKYZ6wnvBYLvbjdw3AEsDOqraC
+9VIYqmzZJJKXD+/c7s4kVFrBM1qcqAaGYwF0tjjpw1fpSMRN6W8tVQc1yFJVzxn8
+7IcJpLfqe34p4zC1qcX6P/7FydyRvf34PxP7mbTfXUCbsud7Au0gdurVOnVFsD1I
+JWm+epSZOQX2ODnuTBib7RhRuTarWfeu6ZrvMwX42lADj+RpIz6cBrLIjJofa5BR
+OSM9BNmR0WVA9leHbTk/+I+bHQhEbOLtKOSyrLaalOc0iu72W99NnqhKBmmVbQYm
+D6Vn/ZWuVteEnhfZ2/uVoSiTsK8fCIhqz5BvSH/XG4VQ26jGVIFfZe2/UjlB+FJg
+v6yTtcbOCxufDWhM5wp6xSOhqzY+JM5EEevh3DuNMkD+sUogi9xKP7pLZLZBikqT
++1fTQZuZ6Af1WTXG6q125NDcyQ+yILYIPC1u/BnrPn+ytc76U6YaDqDRlb9YSqHV
+6bmZ/37WD+2mfquiVkShINH3rpySARbskEHKoxCTXZ+QBifAiVp+4zsCYCY6pit+
+C9PfpHa09VklwmiXj5UWnQG1WOlsjKpT/YLZMhApisstjuCU9RohbMQMl/jCsM1i
+iG8U2UtMu/OZ88MtMuvk2by/7f60Kl2jmk4HfSCh0DTo5FzRpH7giY0U6mUXaZis
+YZ/D5FjanC2AZXp2kZwUQS9sHExlD737Fk/Ac27b8EXLQjVbceo=
+=zB3x
 -----END PGP MESSAGE-----
diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index b202c76..51910a8 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -636,7 +636,7 @@ cpe:
       =bGE5
       -----END PGP MESSAGE-----
     model: TL-WR841N
-    location: Auf Lager
+    location: Auf Lager#fast schon verliehen
     lan-access: pub
     radios:
       'platform/qca953x_wmac':
diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index d75bf35..2b82a1c 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -302,7 +302,6 @@ switches:
         ports:
           - GigabitEthernet 1/0/11
           - GigabitEthernet 1/0/12
-          - GigabitEthernet 1/0/13
           - GigabitEthernet 1/0/14
           - GigabitEthernet 1/0/15
           - GigabitEthernet 1/0/16
@@ -321,6 +320,13 @@ switches:
           - mgmt
           - pub
           - priv9
+      ap18:
+        mode: trunk
+        ports:
+          - GigabitEthernet 1/0/13
+        vlans:
+          - mgmt
+          - pub
     password: |
       -----BEGIN PGP MESSAGE-----