Merge lp:~kbringard/nova/lp742578 into lp:~hudson-openstack/nova/trunk
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~kbringard/nova/lp742578 | ||||
Merge into: | lp:~hudson-openstack/nova/trunk | ||||
Diff against target: |
40 lines (+4/-4) 2 files modified
Authors (+1/-0) nova/network/linux_net.py (+3/-4) |
||||
To merge this branch: | bzr merge lp:~kbringard/nova/lp742578 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Thierry Carrez (community) | ffe | Needs Information | |
termie (community) | Needs Fixing | ||
John Dewey (community) | Needs Information | ||
Review via email: mp+54898@code.launchpad.net |
This proposal has been superseded by a proposal from 2011-04-15.
Description of the change
Add a flag to allow the user to specify a dnsmasq configuration file for nova-network to use when starting dnsmasq. Currently the command line option is set to "--config-fil=" with nothing specified. This branch will leave it as it is if the user does not specify a config file, but will utilize the specific file if they do.
If there is a conflict with the options specified on the command line and those in the configuration file, dnsmasq will use the config file (overriding the command line options) if the option is only allowed to be specified once, or it will use both if the option is allowed to be specified multiple times.
I have found this personally useful for adding things such as "domain=" to set the domain hostname on VMs as well as to more finely tune DNS delegation and upstream resolution.
Looks like the '--conf-file=' flag is always passed. Prior to your change it is just always empty, so your change looks reasonable.
Bit of information needed:
Add yourself to Authors and http:// wiki.openstack. org/Contributor s.
See the prerequisites section of the How to Contribute Guide: wiki.openstack. org/HowToContri bute
http://