diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-05-13 01:45:23 +0100 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-05-25 15:10:33 -0400 |
| commit | 910ed46124e992eb20e49ea156b7127cd3ebbe9d (patch) | |
| tree | 855f2db02f971028e1af1d8db366fd5063177219 /cloudinit | |
| parent | e5b2c011440aefe036c71a8c5e8ec547cc80f270 (diff) | |
| download | vyos-cloud-init-910ed46124e992eb20e49ea156b7127cd3ebbe9d.tar.gz vyos-cloud-init-910ed46124e992eb20e49ea156b7127cd3ebbe9d.zip | |
nplan: For bonds, allow dashed or underscore names of keys.
As some of the bond paramemters are passed in as dashed, or
underscored, depending on the input source.
Also correct transmit-hash-policy netplan target key.
LP: #1690480
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/net/netplan.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/net/netplan.py b/cloudinit/net/netplan.py index 9b71de97..d7ddf0c3 100644 --- a/cloudinit/net/netplan.py +++ b/cloudinit/net/netplan.py @@ -41,7 +41,7 @@ NET_CONFIG_TO_V2 = { 'bond-num-grat-arp': 'gratuitious-arp', 'bond-primary-reselect': 'primary-reselect-policy', 'bond-updelay': 'up-delay', - 'bond-xmit_hash_policy': 'transmit_hash_policy'}, + 'bond-xmit-hash-policy': 'transmit-hash-policy'}, 'bridge': {'bridge_ageing': 'ageing-time', 'bridge_bridgeprio': 'priority', 'bridge_fd': 'forward-delay', @@ -294,7 +294,7 @@ class Renderer(renderer.Renderer): for match in ['bond_', 'bond-']: bond_params = _get_params_dict_by_match(ifcfg, match) for (param, value) in bond_params.items(): - newname = v2_bond_map.get(param) + newname = v2_bond_map.get(param.replace('_', '-')) if newname is None: continue bond_config.update({newname: value}) |