diff options
| author | Kevin Bringard <kbringard@attinteractive.com> | 2011-03-25 10:17:51 -0600 |
|---|---|---|
| committer | Kevin Bringard <kbringard@attinteractive.com> | 2011-03-25 10:17:51 -0600 |
| commit | 52f2479aac7b2fc84c23dba9f337cbfcde6e06e2 (patch) | |
| tree | bbd287565bd09ba34905d151e9eaedc217b4b4d5 | |
| parent | 26f9152d1393950323f0e641cad5a2f8e4458756 (diff) | |
| download | nova-52f2479aac7b2fc84c23dba9f337cbfcde6e06e2.tar.gz nova-52f2479aac7b2fc84c23dba9f337cbfcde6e06e2.tar.xz nova-52f2479aac7b2fc84c23dba9f337cbfcde6e06e2.zip | |
Added a flag to allow a user to specify a dnsmasq_config_file is they would like to fine tune the dnsmasq settings
| -rw-r--r-- | nova/network/linux_net.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 06b05366a..560f568a9 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -65,6 +65,8 @@ flags.DEFINE_string('dns_server', None, flags.DEFINE_string('dmz_cidr', '10.128.0.0/24', 'dmz range that should be accepted') +flags.DEFINE_string('dnsmasq_config_file',"", + 'Override the default dnsmasq settings with those in this file') binary_name = os.path.basename(inspect.stack()[-1][1]) @@ -672,7 +674,7 @@ def _dnsmasq_cmd(net): cmd = ['sudo', '-E', 'dnsmasq', '--strict-order', '--bind-interfaces', - '--conf-file=', + ' --conf-file=%s' %FLAGS.dnsmasq_config_file, '--domain=%s' % FLAGS.dhcp_domain, '--pid-file=%s' % _dhcp_file(net['bridge'], 'pid'), '--listen-address=%s' % net['gateway'], |