From 93f45cdbf87f16b9f384f9c53464b0a2457ebf37 Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 26 Jan 2017 17:50:33 +0100 Subject: [PATCH] cpe: prepare ap20 --- salt-pillar/cpe/aps.sls | 40 ++++++++++++++++++++++++++++++++++++++++ salt/cpe/ap.sh | 17 +++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls index 0e50ac1..adbd482 100644 --- a/salt-pillar/cpe/aps.sls +++ b/salt-pillar/cpe/aps.sls @@ -657,3 +657,43 @@ cpe: ssids: 'ZW public': net: pub + + ap20: + password: | + -----BEGIN PGP MESSAGE----- + + hQEMA2PKcvDMvlKLAQf/couJwoTRzTEycGB3t2aa4NTjOxKmh/Q7ScvHbxEX1VhX + sg0bW+CXQag+zy00oAbXlK/vOSP+NvOlt7vn8X50kmYTHlcZtelry4tAZeBJyw29 + Vb/VvrR6F8nft1q2hpiGzAWgy8rkyncAKwCdLfsdOC/A4/QH5jis9fMnkDLbwUb+ + cruIIe977BlE1jC5s09F7ZSeHUby2lMhcsxuyS+DTsBIc37Qp/Tpeq/sY7wtbrE2 + MbP4mZjtBOgUCCtvauONtKjt2Zg92scob8lHm4m77qh6b4rxJ3lEW+oapelHQGId + ULxd5KM48AqV3AVexmTXNVlU0ppIdPvjxV4WR5VQt9JJAevANNiEBSPbsQwF0QNO + 4M1Fl6WH1WTjVf0WQPMmUowiH0hyJuSx46sju9bEJJCaueJtIhCvUbOeOURwZaVe + ZLBzZVhVZJoO9Q== + =bGE5 + -----END PGP MESSAGE----- + model: TL-WA901NDv3 + location: B 4.04.01 + lan-access: priv7 + radios: + 'platform/ar934x_wmac': + channel: 1 + htmode: HT40+ + ssids: + 'ZW public': + net: pub + 'Zippi': + net: priv7 + psk: | + -----BEGIN PGP MESSAGE----- + + hQEMA2PKcvDMvlKLAQgAjnmaVwPChe6mDZI1yBKyBhsbuGabre05JWYYIReV4rnG + SJEp6Ei7kbm+2iEhrlXyhu9Ke2gILUFXbopRoaytOjvT9VcnBhWLPA4EuqsGLep5 + t32XyK94BLTY3vRhZrvcloZAjXlaGnaEyAQ9Wk5IVoQu1S+TeVd2VOS67BQeeCLr + xFE7mzY8FQR01jBC0QEOXRdfwZ83Zm4JzwTm4ba6CABElmQoBbAPP86ydbNxl1n7 + R/n6y/A6GjgR8HRLaISO0x6Vy6XCWBEhMPbGC8/7qF+1BdVo9qe9IyQBZAyfBQ2b + nTDna1wB4y7CSOEnVC5WRgmjrHr4+JB3/gPPqR6gddJGAYkw7BkNct7Xd8bWaOJP + LSzwuOSwP9ozjMD8RxfJ9ctfGTI4aJ8EcMJ6CAdbnMl0qrucTvlh/nZ/xNtzXplA + is+jAuMF8Q== + =MtC9 + -----END PGP MESSAGE----- diff --git a/salt/cpe/ap.sh b/salt/cpe/ap.sh index 630186d..36a9b3b 100644 --- a/salt/cpe/ap.sh +++ b/salt/cpe/ap.sh @@ -191,6 +191,23 @@ set network.{{ net }}.proto=static set network.{{ net }}.ifname='{{ ' '.join(ports) }}' {%- endfor %} +{%- elif conf['model'] == 'TL-WA901NDv3' %} +{# Only eth0 exists, no switch #} +set network.mgmt=interface +set network.mgmt.ifname=eth0.1 +set network.mgmt.proto=static +set network.mgmt.ipaddr={{ pillar['hosts-inet']['mgmt'][hostname] }} +set network.mgmt.netmask=255.255.255.0 + +{%- for net in bridges.keys() %} + +set network.{{ net }}=interface +set network.{{ net }}.type=bridge +set network.{{ net }}.proto=static +{# Add WAN VLAN to bridge #} +set network.{{ net }}.ifname='{{ 'eth0.' ~ pillar['vlans'][net] }}' +{%- endfor %} + {%- elif conf['model'] == 'DIR-615H1' %} delete network.lan_dev delete network.wan_dev