From 952c0f3b193ddc9540124d41362d08eb542ab77a Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 22 Nov 2016 23:55:15 +0100
Subject: [PATCH] switches/HP-procurve-2824: don't deconfig trunks

these switches will immediately autoconfigure a "dynamnic trunk" that is
quickest dissolved by going onsite, unlocking the rack, and unplugging
the cables.
---
 salt-pillar/switches/init.sls         | 1 +
 salt/switches/HP-procurve-2824.expect | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls
index a9d0912..83cf9e1 100644
--- a/salt-pillar/switches/init.sls
+++ b/salt-pillar/switches/init.sls
@@ -57,6 +57,7 @@ switches:
         vlans:
           - mgmt
           - pub
+          - priv2
           - up1
           - up2
           - up3
diff --git a/salt/switches/HP-procurve-2824.expect b/salt/switches/HP-procurve-2824.expect
index a00778d..b19e39a 100644
--- a/salt/switches/HP-procurve-2824.expect
+++ b/salt/switches/HP-procurve-2824.expect
@@ -62,8 +62,8 @@ expect "(config)# "
 {%-   if conf['mode'] == 'trunk' %}
 {%-   set group = group + 1 %}
 
-send "no trunk {{ conf['ports'] }}\r"
-expect "(config)# "
+# send "no trunk {{ conf['ports'] }}\r"
+# expect "(config)# "
 send "trunk {{ conf['ports'] }} trk{{ group }} lacp\r"
 expect "(config)# "
 {%-   for vlan_name in conf['vlans'] %}