Merge ~darren-birkett/cloud-init:fix-infiniband-1847114 into cloud-init:master
Proposed by
Darren Birkett
Status: | Merged |
---|---|
Approved by: | Ryan Harper |
Approved revision: | 4a94332920192b36e83d5ea71ddacc37f00c6a4e |
Merge reported by: | Server Team CI bot |
Merged at revision: | not available |
Proposed branch: | ~darren-birkett/cloud-init:fix-infiniband-1847114 |
Merge into: | cloud-init:master |
Diff against target: |
95 lines (+35/-6) 3 files modified
cloudinit/net/eni.py (+5/-4) cloudinit/net/sysconfig.py (+2/-1) tests/unittests/test_net.py (+28/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ryan Harper | Approve | ||
Server Team CI bot | continuous-integration | Approve | |
Review via email: mp+373759@code.launchpad.net |
Commit message
net: enable infiniband support in eni and sysconfig renderers
Commit e7b0e5f72 added support for configuring infiniband devices by
adding a new infiniband 'type'. This commit updates eni and sysconfig
renderers to consume this new type and configure infiniband devices
correctly.
LP: #1847114
To post a comment you must log in.
Thanks for looking at this. I'd like to get this plumbed into the unittests for network generation ( tests/unittests /test_net. py ); I suggest adding this to the 'all' scenario, update the yaml to include the IB interface:
@@ -1456,6 +1476,12 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
vlan_ id: 200
subnets:
- type: dhcp4
+ # An Infiniband
+ - type: infiniband
+ name: ib0
+ mac_address: 00:11:22:33:44:56
+ subnets:
+ - type: dhcp4
And then fix up the expected eni and sysconfig output; lastly this will need an update to handle the convertion of v1 with type: infiniband to v2 where the type: infiniband will be converted to an ethernet type.