From 0f5b95575afeb14fea80bead6720bf510f5358f5 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Mon, 26 Jul 2010 14:41:51 -0700 Subject: [PATCH 1/2] moved misnamed nova-dchp file --- debian/{nova-dhcp.conf => nova-dhcpbridge.conf} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename debian/{nova-dhcp.conf => nova-dhcpbridge.conf} (100%) diff --git a/debian/nova-dhcp.conf b/debian/nova-dhcpbridge.conf similarity index 100% rename from debian/nova-dhcp.conf rename to debian/nova-dhcpbridge.conf From ffe52b8660123335e425c52eb3bebba2e3d2e42f Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Mon, 26 Jul 2010 14:48:08 -0700 Subject: [PATCH 2/2] default flag file full path --- nova/compute/linux_net.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/compute/linux_net.py b/nova/compute/linux_net.py index 48e07da66424..861ce779bb12 100644 --- a/nova/compute/linux_net.py +++ b/nova/compute/linux_net.py @@ -29,7 +29,7 @@ from nova import flags FLAGS=flags.FLAGS flags.DEFINE_string('dhcpbridge_flagfile', - '/etc/nova-dhcpbridge.conf', + '/etc/nova/nova-dhcpbridge.conf', 'location of flagfile for dhcpbridge') def execute(cmd, addl_env=None):