cloud-init-dev team mailing list archive

[Darren Birkett <darren.birkett@xxxxxxxxx>]

Darren Birkett has proposed merging ~darren-birkett/cloud-init:fix-infiniband-1847114 into cloud-init:master.

Commit message:
Fix infiniband net device configuration in eni.py

Commit e7b0e5f72 added support for configuring infiniband devices by
adding a new infiniband 'type'. This commit updates eni.py to consume
this new type and configure infiniband devices correctly

Fixes: 1847114

Requested reviews:
  cloud-init Commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~darren-birkett/cloud-init/+git/cloud-init/+merge/373759
-- 
Your team cloud-init Commiters is requested to review the proposed merge of ~darren-birkett/cloud-init:fix-infiniband-1847114 into cloud-init:master.

diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py
index b129bb6..6bbc83b 100644
--- a/cloudinit/net/eni.py
+++ b/cloudinit/net/eni.py
@@ -94,7 +94,7 @@ def _iface_add_attrs(iface, index, ipv4_subnet_mtu):
     ]
 
     renames = {'mac_address': 'hwaddress'}
-    if iface['type'] not in ['bond', 'bridge', 'vlan']:
+    if iface['type'] not in ['bond', 'bridge', 'infiniband', 'vlan']:
         ignore_map.append('mac_address')
 
     for key, value in iface.items():
@@ -467,9 +467,10 @@ class Renderer(renderer.Renderer):
         order = {
             'loopback': 0,
             'physical': 1,
-            'bond': 2,
-            'bridge': 3,
-            'vlan': 4,
+            'infiniband': 2,
+            'bond': 3,
+            'bridge': 4,
+            'vlan': 5,
         }
 
         sections = []