diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-28 02:21:11 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-07-28 02:21:11 -0700 |
| commit | 2c6bf00a35c45cb63a0c8688bbf2504dd8610bb1 (patch) | |
| tree | 4a024af6e8e2ac8eec111d10613640ea21e8df3a | |
| parent | 0d32008ea944071b99dea5a88805d78736e5f21e (diff) | |
| download | nova-2c6bf00a35c45cb63a0c8688bbf2504dd8610bb1.tar.gz nova-2c6bf00a35c45cb63a0c8688bbf2504dd8610bb1.tar.xz nova-2c6bf00a35c45cb63a0c8688bbf2504dd8610bb1.zip | |
Fix dnsmasq commands to pass in environment properly
| -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): |