diff options
| author | Ewan Mellor <ewan.mellor@citrix.com> | 2010-07-29 00:58:33 +0100 |
|---|---|---|
| committer | Ewan Mellor <ewan.mellor@citrix.com> | 2010-07-29 00:58:33 +0100 |
| commit | 04a6a0267e7dc0f4e587e43f23b4acf0dcef52fc (patch) | |
| tree | 6bcdfafed1cb2332ebd8b7c0d03b4fed4a82520e /nova/compute | |
| parent | 9f4996e8738991a95a23cba2caa660f7002f94cd (diff) | |
| download | nova-04a6a0267e7dc0f4e587e43f23b4acf0dcef52fc.tar.gz nova-04a6a0267e7dc0f4e587e43f23b4acf0dcef52fc.tar.xz nova-04a6a0267e7dc0f4e587e43f23b4acf0dcef52fc.zip | |
More merges from trunk. Not everything came over the first time.
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/linux_net.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/compute/linux_net.py b/nova/compute/linux_net.py index 861ce779b..4a4b4c8a8 100644 --- a/nova/compute/linux_net.py +++ b/nova/compute/linux_net.py @@ -94,7 +94,7 @@ def bridge_create(net): execute("sudo ifconfig %s up" % net['bridge_name']) def dnsmasq_cmd(net): - cmd = ['sudo dnsmasq', + cmd = ['sudo -E dnsmasq', ' --strict-order', ' --bind-interfaces', ' --conf-file=', @@ -143,8 +143,9 @@ def start_dnsmasq(network): if os.path.exists(lease_file): os.unlink(lease_file) - # FLAGFILE in env - env = {'FLAGFILE' : FLAGS.dhcpbridge_flagfile} + # FLAGFILE and DNSMASQ_INTERFACE in env + env = {'FLAGFILE': FLAGS.dhcpbridge_flagfile, + 'DNSMASQ_INTERFACE': network['bridge_name']} execute(dnsmasq_cmd(network), addl_env=env) def stop_dnsmasq(network): |