OpenStack Compute (nova)

Merge lp:~citrix-openstack/nova/lp787657 into lp:~hudson-openstack/nova/trunk

  1. lp787657
  2. Merge into trunk
Proposed by Sateesh
Status: Merged
Approved by: Devin Carlen
Approved revision: 1114
Merged at revision: 1114
Proposed branch: lp:~citrix-openstack/nova/lp787657
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 14 lines (+1/-3)
1 file modified
nova/network/vmwareapi_net.py (+1/-3)
To merge this branch: bzr merge lp:~citrix-openstack/nova/lp787657
Reviewer Review Type Date Requested Status
Devin Carlen (community) Approve
Ed Leafe (community) Approve
Brian Waldon (community) Approve
Review via email: mp+62407@code.launchpad.net

Description of the change

In vmwareapi_net.py removed the code that defines the flag 'vlan_interface' and added code to set default value for the flag 'vlan_interface' to 'vmnic0'. This will now avoid flag re-definition issue.

To post a comment you must log in.
Revision history for this message
Brian Waldon (bcwaldon) wrote :

This is definitely more ideal than redefining the flag altogether. Good work.

review: Approve
Revision history for this message
Ed Leafe (ed-leafe) wrote :

lgtm

review: Approve
Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/network/vmwareapi_net.py'
2--- nova/network/vmwareapi_net.py 2011-05-11 19:24:01 +0000
3+++ nova/network/vmwareapi_net.py 2011-05-26 05:15:51 +0000
4@@ -30,9 +30,7 @@
5
6
7 FLAGS = flags.FLAGS
8-flags.DEFINE_string('vlan_interface', 'vmnic0',
9- 'Physical network adapter name in VMware ESX host for '
10- 'vlan networking')
11+FLAGS['vlan_interface'].SetDefault('vmnic0')
12
13
14 def ensure_vlan_bridge(vlan_num, bridge, net_attrs=None):