nova-dhcpbridge should require the FLAGFILE is set

Code Issues Proposed changes

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

This commit is contained in:

Mark McLoughlin

2012年11月23日 12:12:51 +00:00

parent 2e1ff2e725

commit d3c68d6e63

1 changed files with 2 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4
bin/nova-dhcpbridge

View File

@@ -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')):

nova-dhcpbridge should require the FLAGFILE is set

4 bin/nova-dhcpbridge Unescape Escape View File

4
bin/nova-dhcpbridge

View File