Merge ~smoser/cloud-init:bug/1674946-openstack-add-dvs into cloud-init:master

Proposed by Scott Moser
Status: Merged
Merged at revision: 61eb03fef92f435434d974fb46439189ef0b5f97
Proposed branch: ~smoser/cloud-init:bug/1674946-openstack-add-dvs
Merge into: cloud-init:master
Diff against target: 12 lines (+1/-0)
1 file modified
cloudinit/sources/helpers/openstack.py (+1/-0)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Lars Kellogg-Stedman (community) Approve
cloud-init Commiters Pending
Review via email: mp+321709@code.launchpad.net

Commit message

OpenStack: add 'dvs' to the list of physical link types.

Links presented in network_data.json to the guest running on ESXi
are of type 'dvs'.

LP: #1674946

To post a comment you must log in.
Revision history for this message
Lars Kellogg-Stedman (larsks) wrote :

Seems fine to me, although I'm still in favor of just defaulting to something sane instead of throwing a ValueError for unknown link types.

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py
2index 096062d..61cd36b 100644
3--- a/cloudinit/sources/helpers/openstack.py
4+++ b/cloudinit/sources/helpers/openstack.py
5@@ -52,6 +52,7 @@ OS_VERSIONS = (
6 PHYSICAL_TYPES = (
7 None,
8 'bridge',
9+ 'dvs',
10 'ethernet',
11 'hw_veb',
12 'hyperv',

Subscribers

People subscribed via source and target branches