From c2ece5fd83551f2ceaa14f9f1b859417194de305 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 9 Feb 2017 01:59:50 +0100
Subject: [PATCH] switches: fix 3com bonding

---
 salt-pillar/cpe/aps.sls         |  1 -
 salt/switches/3com-4200G.expect | 10 ++--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/salt-pillar/cpe/aps.sls b/salt-pillar/cpe/aps.sls
index e68ad89..b4c392a 100644
--- a/salt-pillar/cpe/aps.sls
+++ b/salt-pillar/cpe/aps.sls
@@ -308,7 +308,6 @@ cpe:
               =MtC9
               -----END PGP MESSAGE-----
   ap8:
-    firstboot: True
     password: |
       -----BEGIN PGP MESSAGE-----
       
diff --git a/salt/switches/3com-4200G.expect b/salt/switches/3com-4200G.expect
index 28a9c1f..e2cfcc6 100644
--- a/salt/switches/3com-4200G.expect
+++ b/salt/switches/3com-4200G.expect
@@ -63,15 +63,9 @@ expect "{{ hostname }}]"
 send "interface {{ port }}\r"
 expect "]"
 {%-       if conf['mode'] == 'bond' %}
-send "lacp enable\r"
+send "undo lacp enable\rundo port link-aggregation group\rport link-aggregation group {{ group }}\rlacp enable\r"
 {%-       else %}
-send "undo lacp enable\r"
-{%-       endif %}
-expect "]"
-{%-       if conf['mode'] == 'bond' %}
-send "undo port link-aggregation group\rport link-aggregation group {{ group }}\r"
-{%-       else %}
-send "undo port link-aggregation group\r"
+send "undo lacp enable\rundo port link-aggregation group\r"
 {%-       endif %}
 expect "]"
 {%-       if conf.get('vlans') %}