diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-26 16:01:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-26 16:01:28 +0000 |
| commit | 833eb29705e8f52692c64cfb1af3725d3780fead (patch) | |
| tree | 8001b46b001a1995dd1d690fb822205c77c068bf | |
| parent | 04b160909008948bf7fa4831ad5020be53922139 (diff) | |
| parent | ae0a0d54351e71e3d723d7c0c6de8db2cdbab772 (diff) | |
| download | nova-833eb29705e8f52692c64cfb1af3725d3780fead.tar.gz nova-833eb29705e8f52692c64cfb1af3725d3780fead.tar.xz nova-833eb29705e8f52692c64cfb1af3725d3780fead.zip | |
Merge "Fix config-file overrides for 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')): |