]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
Fix metadata proxy start problem for v6-v4 network
authorXu Han Peng <xuhanp@cn.ibm.com>
Fri, 14 Nov 2014 02:53:59 +0000 (10:53 +0800)
committerAlan Pevec <alan.pevec@redhat.com>
Tue, 25 Nov 2014 23:07:33 +0000 (00:07 +0100)
commit8b5c08b35e75de6e09b75ed01120b6fdedb9125f
treecad36826f6e294ab04379f80d6894e840961dd70
parent463eb73e2a99ad1af2c1f8bba466654b6468af5b
Fix metadata proxy start problem for v6-v4 network

Commit 1b66e11b5d8c0b3de0610ca02c3e10b6f64ae375 introduces
a new problem that metadata proxy will not be started when
an isolated network contains ipv6 subnet with dhcp enabled
and a ipv4 subnet.

This fix separates the checks to enable dhcp and enable metadata
so metadata proxy can be started if there is ipv4 subnet exists
in the network with metadata enabled.

Change-Id: If26806083db225e9ab30d75fa6c728ce99a7cafe
Closes-Bug: 1392564
(cherry picked from commit 4c128c351589ef9f2fc1e084c655a97bdbbda7ce)
neutron/agent/dhcp_agent.py
neutron/tests/unit/test_dhcp_agent.py