Commit 2f414196 authored by Dietmar Maurer's avatar Dietmar Maurer

use new ovs bond modes (changed in pve-common)

parent d64f5355
...@@ -20,14 +20,15 @@ my $iflockfn = "/etc/network/.pve-interfaces.lock"; ...@@ -20,14 +20,15 @@ my $iflockfn = "/etc/network/.pve-interfaces.lock";
my $bond_mode_enum = [ my $bond_mode_enum = [
'balance-rr', 'balance-rr',
'active-backup', 'active-backup', # OVS and Linux
'balance-xor', 'balance-xor',
'broadcast', 'broadcast',
'802.3ad', '802.3ad',
'balance-tlb', 'balance-tlb',
'balance-alb', 'balance-alb',
'balance-slb', # OVS only 'balance-slb', # OVS
'balance-tcp', # OVS only 'lacp-balance-slb', # OVS
'lacp-balance-tcp', # OVS
]; ];
my $network_type_enum = ['bridge', 'bond', 'eth', 'alias', my $network_type_enum = ['bridge', 'bond', 'eth', 'alias',
......
...@@ -9,9 +9,10 @@ Ext.define('PVE.form.BondModeSelector', { ...@@ -9,9 +9,10 @@ Ext.define('PVE.form.BondModeSelector', {
if (me.openvswitch) { if (me.openvswitch) {
me.data = [ me.data = [
['balance-tcp', 'balance-tcp'], ['active-backup', 'active-backup'],
['balance-slb', 'balance-slb'], ['balance-slb', 'balance-slb'],
['active-backup', 'active-backup'] ['lacp-balance-slb', 'LACP (balance-slb)'],
['lacp-balance-tcp', 'LACP (balance-tcp)']
]; ];
} else { } else {
me.data = [ me.data = [
...@@ -19,7 +20,7 @@ Ext.define('PVE.form.BondModeSelector', { ...@@ -19,7 +20,7 @@ Ext.define('PVE.form.BondModeSelector', {
['active-backup', 'active-backup'], ['active-backup', 'active-backup'],
['balance-xor', 'balance-xor'], ['balance-xor', 'balance-xor'],
['broadcast', 'broadcast'], ['broadcast', 'broadcast'],
['802.3ad', '802.3ad'], ['802.3ad', 'LACP (layer2)'],
['balance-tlb', 'balance-tlb'], ['balance-tlb', 'balance-tlb'],
['balance-alb', 'balance-alb'] ['balance-alb', 'balance-alb']
]; ];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment