cloud-init-dev team mailing list archive

[Dimitri John Ledkov <launchpad@xxxxxxxxxxxx>]

Dimitri John Ledkov has proposed merging ~xnox/cloud-init:dash_underscore into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1690480 in cloud-init (Ubuntu): "cloud-init / nplan - missing bond mode miimon xmit_hash_policy"
  https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/1690480

For more details, see:
https://code.launchpad.net/~xnox/cloud-init/+git/cloud-init/+merge/324014
-- 
Your team cloud init development team is requested to review the proposed merge of ~xnox/cloud-init:dash_underscore into cloud-init:master.

diff --git a/cloudinit/net/netplan.py b/cloudinit/net/netplan.py
index 825fe83..2a20bc9 100644
--- a/cloudinit/net/netplan.py
+++ b/cloudinit/net/netplan.py
@@ -35,12 +35,15 @@ NET_CONFIG_TO_V2 = {
              'bond-downdelay': 'down-delay',
              'bond-fail-over-mac': 'fail-over-mac-policy',
              'bond-lacp-rate': 'lacp-rate',
+             'bond_miimon': 'mii-monitor-interval',
              'bond-miimon': 'mii-monitor-interval',
              'bond-min-links': 'min-links',
+             'bond_mode': 'mode',
              'bond-mode': 'mode',
              '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',