diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-25 11:03:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-25 11:03:06 +0000 |
| commit | b34f5300ef158e5b2a1825a1cd90bf5586d295a3 (patch) | |
| tree | d3abe05c125594ed05c9699240baf813a7b5fe8c | |
| parent | 795e523b075756c3f512caa7703ce3f71b8426f1 (diff) | |
| parent | d3c68d6e63fd26a96a6d50c6bdb4ba479bacabfb (diff) | |
| download | nova-b34f5300ef158e5b2a1825a1cd90bf5586d295a3.tar.gz nova-b34f5300ef158e5b2a1825a1cd90bf5586d295a3.tar.xz nova-b34f5300ef158e5b2a1825a1cd90bf5586d295a3.zip | |
Merge "nova-dhcpbridge should require the FLAGFILE is set"
| -rwxr-xr-x | bin/nova-dhcpbridge | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index b3370e6eb..1aaecc5b7 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -95,8 +95,8 @@ def init_leases(network_id): def main(): """Parse environment and arguments and call the approproate action.""" - flagfile = os.environ.get('FLAGFILE', CONF.dhcpbridge_flagfile) - argv = config.parse_args(sys.argv, default_config_files=[flagfile]) + argv = config.parse_args(sys.argv, + default_config_files=[os.environ['FLAGFILE']]) logging.setup("nova") if int(os.environ.get('TESTING', '0')): |