diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-11-23 12:12:51 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-11-23 12:15:22 +0000 |
| commit | d3c68d6e63fd26a96a6d50c6bdb4ba479bacabfb (patch) | |
| tree | 8edc940e964ca3dc67dc3de33be046ac6e75361e | |
| parent | 2e1ff2e72580c2e9b123aded0916ebb5358b2aea (diff) | |
nova-dhcpbridge should require the FLAGFILE is set
We always launch dnsmasq with FLAGFILE set, so something is very broken
if FLAGFILE isn't set when nova-dhcpbridge is launched.
Also, the fallback to CONF.dhcpbridge_flagfile is a little strange - at
this point, we haven't parsed any config files so the only possible
value of this config option is its default value.
There's no real need to gracefully handle this condition either - a
KeyError is a straightforward enough error.
Change-Id: I734d7b739f17c8a9ab48d8ba13baacff3f00e1c4
| -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')): |