Merge "Add sanity_check for keepalived ipv6 support"

diff --cc neutron/cmd/sanity/checks.py
index 22570857e646746ec208020b90487fc451f74c50,3e90f45bcdfd5aa82b29c3900a6c1bb57da26c36..5d90ad9c306e0d83b1f69b925bcb7ffd5125e94a
--- 1/neutron/cmd/sanity/checks.py
--- 2/neutron/cmd/sanity/checks.py
+++ b/neutron/cmd/sanity/checks.py
@@@ -14,21 -14,28 +14,29 @@@
  #    under the License.
  
  import re
+ import shutil
+ import tempfile
  
  import netaddr
+ from oslo_config import cfg
  from oslo_log import log as logging
 +from oslo_utils import uuidutils
  import six
  
  from neutron.agent.common import ovs_lib
+ from neutron.agent.l3 import ha_router
+ from neutron.agent.l3 import namespaces
+ from neutron.agent.linux import external_process
  from neutron.agent.linux import ip_lib
  from neutron.agent.linux import ip_link_support
+ from neutron.agent.linux import keepalived
  from neutron.agent.linux import utils as agent_utils
+ from neutron.common import constants as n_consts
  from neutron.common import utils
  from neutron.i18n import _LE
 -from neutron.openstack.common import uuidutils
  from neutron.plugins.common import constants as const
 -from neutron.plugins.openvswitch.common import constants as ovs_const
 +from neutron.plugins.ml2.drivers.openvswitch.agent.common \
 +    import constants as ovs_const
  
  LOG = logging.getLogger(__name__)
  

diff --cc neutron/cmd/sanity_check.py
Simple merge