From 01fe73f99c456adb6d7a231e5ef6e5497d926b5f Mon Sep 17 00:00:00 2001
From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Date: Tue, 20 Nov 2018 11:51:27 +0200
Subject: [PATCH] Trivial: Fix ovs cleanup script on Windows

The ovs cleanup script fails to run on Windows due to an import
error. The linux utils module will always get imported, which uses
platform specific modules.

Since only a constant is used from this module, the import can
easily be removed, fixing this issue.

Change-Id: I0cf7b629dc5d374d2066346276f73a12e4d03973
Closes-Bug: #1804180
---
 neutron/conf/agent/cmd.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/neutron/conf/agent/cmd.py b/neutron/conf/agent/cmd.py
index 4e7d4b95511..94457c1183f 100644
--- a/neutron/conf/agent/cmd.py
+++ b/neutron/conf/agent/cmd.py
@@ -13,7 +13,6 @@
 from oslo_config import cfg
 
 from neutron._i18n import _
-from neutron.agent.linux import ipset_manager
 
 
 ip_opts = [
@@ -25,7 +24,7 @@ ip_opts = [
                 help=_('Destroy IPsets even if there is an iptables '
                        'reference.')),
     cfg.StrOpt('prefix',
-               default=ipset_manager.NET_PREFIX,
+               default='N',  # ipset_manager.NET_PREFIX
                help=_('String prefix used to match IPset names.')),
 ]