diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-26 18:25:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-26 18:25:35 +0000 |
| commit | ce9f018e420614c68fe0c716f2e572b8f638e7b7 (patch) | |
| tree | 1c38b4aa8247b6f3bcb7451a51f48393039f7458 /network/config/bond-with-vlans/controller-v6.yaml | |
| parent | f950cf860f784de48040ece87035260a41d52662 (diff) | |
| parent | 2c11e9e179178d074af91d8c5c798078ac3e0966 (diff) | |
Merge "Fix descriptions on bonding templates"
Diffstat (limited to 'network/config/bond-with-vlans/controller-v6.yaml')
| -rw-r--r-- | network/config/bond-with-vlans/controller-v6.yaml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/network/config/bond-with-vlans/controller-v6.yaml b/network/config/bond-with-vlans/controller-v6.yaml index 25796484..33c6fa65 100644 --- a/network/config/bond-with-vlans/controller-v6.yaml +++ b/network/config/bond-with-vlans/controller-v6.yaml @@ -34,16 +34,14 @@ parameters: type: string BondInterfaceOvsOptions: default: bond_mode=active-backup - description: The ovs_options string for the bond interface. Set things like lacp=active and/or bond_mode=balance-slb using - this option. + description: 'The ovs_options or bonding_options string for the bond + interface. Set things like lacp=active and/or bond_mode=balance-slb + for OVS bonds or like mode=4 for Linux bonds using this option.' type: string constraints: - allowed_pattern: ^((?!balance.tcp).)*$ description: 'The balance-tcp bond mode is known to cause packet loss and - - should not be used in BondInterfaceOvsOptions. - - ' + should not be used in BondInterfaceOvsOptions.' ExternalNetworkVlanID: default: 10 description: Vlan ID for the external network traffic. |