diff --git a/salt-pillar/switches/init.sls b/salt-pillar/switches/init.sls index 045dee1..926677e 100644 --- a/salt-pillar/switches/init.sls +++ b/salt-pillar/switches/init.sls @@ -604,6 +604,7 @@ switches: mode: bond group: 1 ports: 15-16 + lacp: no vlans: - mgmt - pub diff --git a/salt/switches/HP-procurve-2824.expect b/salt/switches/HP-procurve-2824.expect index 780f512..2f331f6 100644 --- a/salt/switches/HP-procurve-2824.expect +++ b/salt/switches/HP-procurve-2824.expect @@ -73,10 +73,16 @@ expect "(config)# " {%- for name, conf in switch['ports'].items() %} {%- if conf['mode'] == 'bond' %} +{%- if not conf.get('lacp', False) %} +send "trunk {{ conf['ports'] }} trk{{ conf['group'] }} trunk\r" +expect "(config)# " + +{%- else %} send "interface {{ conf['ports'] }} lacp active\r" expect "(config)# " send "trunk {{ conf['ports'] }} trk{{ conf['group'] }} lacp\r" expect "(config)# " +{%- endif %} {%- for vlan_name in conf['vlans'] %} send "vlan {{ pillar['vlans'][vlan_name] }} tagged trk{{ conf['group'] }}\r"