diff options
| author | Andrew Laski <andrew.laski@rackspace.com> | 2012-10-25 23:26:03 -0400 |
|---|---|---|
| committer | Andrew Laski <andrew.laski@rackspace.com> | 2012-10-26 09:47:16 -0400 |
| commit | ae0a0d54351e71e3d723d7c0c6de8db2cdbab772 (patch) | |
| tree | 7209a26f93fad1dffc2ccfeb9cbf022d88a78cb8 /bin/nova-dhcpbridge | |
| parent | 409de17308f221468e6e9d609752a57da34f1b3b (diff) | |
| download | nova-ae0a0d54351e71e3d723d7c0c6de8db2cdbab772.tar.gz nova-ae0a0d54351e71e3d723d7c0c6de8db2cdbab772.tar.xz nova-ae0a0d54351e71e3d723d7c0c6de8db2cdbab772.zip | |
Fix config-file overrides for nova-dhcpbridge
nova-dhcpbridge can read in an alternate config file location but wasn't
using it to parse config options. This fixes a regression introduced in
00786bc554a2dfacb3c6f02fbb7e9c98f35d4262.
This change is motivated by the fact that nova-dhcpbridge is passed to
dnsmasq in restart_dhcp() in nova/network/linux_net.py, and there is
currently no support for overriding config options for nova-dhcpbridge
in that call. There is support for overriding the FLAGFILE env variable
in that call, but nova-dhcpbridge was ignoring that. If I start
nova-network with an alternate config this provides a way for me to pass
that config to nova-dhcpbridge as well.
Change-Id: I002ea768500555a089bd1d5b0fea2354b27fba14
Diffstat (limited to 'bin/nova-dhcpbridge')
| -rwxr-xr-x | bin/nova-dhcpbridge | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index 114dee268..0fc7751fc 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -94,7 +94,7 @@ def init_leases(network_id): def main(): """Parse environment and arguments and call the approproate action.""" flagfile = os.environ.get('FLAGFILE', FLAGS.dhcpbridge_flagfile) - argv = flags.parse_args(sys.argv) + argv = flags.parse_args(sys.argv, default_config_files=[flagfile]) logging.setup("nova") if int(os.environ.get('TESTING', '0')): |