From 545e51de9a523cfeaf015ef7506e24ef3a19ee33 Mon Sep 17 00:00:00 2001
From: Dan Smith <dansmith@redhat.com>
Date: Thu, 7 Jul 2016 11:47:52 -0700
Subject: [PATCH] Remove deprecated network_api_class option

This was deprecated in Mitaka and is removed in Newton.

Change-Id: Ia8e3faba59b30fad284041f5b1ba543824d1ccac
---
 nova/utils.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nova/utils.py b/nova/utils.py
index eeeb8ea1c..46d169a6f 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -1093,10 +1093,7 @@ def is_neutron():
     if _IS_NEUTRON is not None:
         return _IS_NEUTRON
 
-    # TODO(sdague): As long as network_api_class is importable
-    # is_neutron can return None to mean we have no idea what their
-    # class is.
-    _IS_NEUTRON = (nova.network.is_neutron() is True)
+    _IS_NEUTRON = nova.network.is_neutron()
     return _IS_NEUTRON