diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls index 6a9253d..9474f88 100644 --- a/salt-pillar/cpe/aps.sls +++ b/salt-pillar/cpe/aps.sls @@ -312,21 +312,6 @@ cpe: ssids: 'ZW public': net: pub - 'mino': - net: priv40 - psk: | - -----BEGIN PGP MESSAGE----- - - hQEMA2PKcvDMvlKLAQf/WDPAfpFAdq7FgbD4VCg6t0I7MDHug1UTVcMXoxsA52kL - 9UEPddnJWqpK/fdYGnu2AkVDis2DL8Y9Hje6MMFuV/Y9pNCu3d8FJRiw8DmyqDIt - aZF8GpKX20UgBLl/smwZAvfTfc6ocF7vN2alLoB9SW9qYpBFZuY1ZLkvTlo9raWN - k/RKsoCFW4tyGGJBFua10oAWE+zIEjFdVK8SrAI58mLJnHcblj6ubggJWEokBf7A - NPY0ZdRNKICL/qEzNRQ8qWs5MI7iMH2Yrtspx18eAG4+q6UgvGNYNUvQiSrebNnc - +kk+GHu1Vv6RILNC9Px+T33BnNXnpyzocEa4S3OTENJHAQYe/Q+Z149jeCFMNh7j - GxST14APGLAaUPq4F5I63jcaDa7LFBd2D7kv+iq3XF9Jaseq3Wv+qAPbj6bxVcPx - t9LOteUWIog= - =roDm - -----END PGP MESSAGE----- ap8: password: | @@ -828,6 +813,21 @@ cpe: a0A+Ovk= =PUn+ -----END PGP MESSAGE----- + 'mino': + net: priv40 + psk: | + -----BEGIN PGP MESSAGE----- + + hQEMA2PKcvDMvlKLAQf/WDPAfpFAdq7FgbD4VCg6t0I7MDHug1UTVcMXoxsA52kL + 9UEPddnJWqpK/fdYGnu2AkVDis2DL8Y9Hje6MMFuV/Y9pNCu3d8FJRiw8DmyqDIt + aZF8GpKX20UgBLl/smwZAvfTfc6ocF7vN2alLoB9SW9qYpBFZuY1ZLkvTlo9raWN + k/RKsoCFW4tyGGJBFua10oAWE+zIEjFdVK8SrAI58mLJnHcblj6ubggJWEokBf7A + NPY0ZdRNKICL/qEzNRQ8qWs5MI7iMH2Yrtspx18eAG4+q6UgvGNYNUvQiSrebNnc + +kk+GHu1Vv6RILNC9Px+T33BnNXnpyzocEa4S3OTENJHAQYe/Q+Z149jeCFMNh7j + GxST14APGLAaUPq4F5I63jcaDa7LFBd2D7kv+iq3XF9Jaseq3Wv+qAPbj6bxVcPx + t9LOteUWIog= + =roDm + -----END PGP MESSAGE----- ap21: password: | diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls index eabe821..b3ebde2 100644 --- a/salt-pillar/switches/init.sls +++ b/salt-pillar/switches/init.sls @@ -115,6 +115,7 @@ switches: - priv34 - priv36 - priv37 + - priv40 - iso1 - iso2 - iso3 @@ -148,7 +149,6 @@ switches: - priv16 - priv21 - priv38 - - priv40 server1: mode: bond group: 7 @@ -596,6 +596,7 @@ switches: - priv34 - priv36 - priv37 + - priv40 up1: mode: access ports: '1' @@ -666,6 +667,7 @@ switches: - mgmt - pub - priv26 + - priv40 ap26: mode: trunk ports: 18 @@ -721,7 +723,6 @@ switches: - priv16 - priv21 - priv38 - - priv40 ap9: mode: trunk ports: 5 @@ -744,7 +745,6 @@ switches: vlans: - mgmt - pub - - priv40 ap22: mode: trunk ports: 2