OpenStack Compute (nova)

Merge lp:~vishvananda/nova/lp692716 into lp:~hudson-openstack/nova/trunk

  1. lp692716
  2. Merge into trunk
Proposed by Vish Ishaya
Status: Merged
Approved by: Vish Ishaya
Approved revision: 470
Merged at revision: 473
Proposed branch: lp:~vishvananda/nova/lp692716
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 13 lines (+1/-2)
1 file modified
nova/network/manager.py (+1/-2)
To merge this branch: bzr merge lp:~vishvananda/nova/lp692716
Reviewer Review Type Date Requested Status
Eric Day (community) Approve
Josh Kearney (community) Approve
Rick Clark (community) Approve
Review via email: mp+44274@code.launchpad.net

Description of the change

This stops the nova-network dhcp ip from being added to all of the compute hosts.

To post a comment you must log in.
Revision history for this message
Rick Clark (dendrobates) wrote :

looks good

review: Approve
Revision history for this message
Josh Kearney (jk0) wrote :

lgtm

review: Approve
Revision history for this message
Eric Day (eday) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'nova/network/manager.py'
--- nova/network/manager.py 2010-12-08 20:59:22 +0000
+++ nova/network/manager.py 2010-12-20 20:12:10 +0000
@@ -361,8 +361,7 @@
361 """Sets up matching network for compute hosts."""361 """Sets up matching network for compute hosts."""
362 network_ref = db.network_get_by_instance(context, instance_id)362 network_ref = db.network_get_by_instance(context, instance_id)
363 self.driver.ensure_bridge(network_ref['bridge'],363 self.driver.ensure_bridge(network_ref['bridge'],
364 FLAGS.flat_interface,364 FLAGS.flat_interface)
365 network_ref)
366365
367 def setup_fixed_ip(self, context, address):366 def setup_fixed_ip(self, context, address):
368 """Setup dhcp for this network."""367 """Setup dhcp for this network."""