OpenStack Compute (nova)

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

  1. dhcplease-flags
  2. Merge into trunk
Proposed by Vish Ishaya
Status: Merged
Approved by: Vish Ishaya
Approved revision: 145
Merged at revision: 169
Proposed branch: lp:~vishvananda/nova/dhcplease-flags
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 13 lines (+1/-1)
1 file modified
nova/compute/linux_net.py (+1/-1)
To merge this branch: bzr merge lp:~vishvananda/nova/dhcplease-flags
Reviewer Review Type Date Requested Status
Eric Day (community) Approve
Soren Hansen (community) Approve
Review via email: mp+30997@code.launchpad.net

Commit message

Ensure consistent use of filename for dhcp bridge flag file.

Description of the change

One file was misnamed causing package building to fail.

To post a comment you must log in.
Revision history for this message
Soren Hansen (soren) 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
1=== renamed file 'debian/nova-dhcp.conf' => 'debian/nova-dhcpbridge.conf'
2=== modified file 'nova/compute/linux_net.py'
3--- nova/compute/linux_net.py 2010-07-19 19:45:39 +0000
4+++ nova/compute/linux_net.py 2010-07-26 21:52:45 +0000
5@@ -29,7 +29,7 @@
6 FLAGS=flags.FLAGS
7
8 flags.DEFINE_string('dhcpbridge_flagfile',
9- '/etc/nova-dhcpbridge.conf',
10+ '/etc/nova/nova-dhcpbridge.conf',
11 'location of flagfile for dhcpbridge')
12
13 def execute(cmd, addl_env=None):