From: Matt Riedemann <mriedem@us.ibm.com>
Date: Wed, 1 May 2013 11:05:07 +0000 (-0700)
Subject: Only map nicira_nvp_plugin module if installed
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a2bdb161a59c19b8c1a3ea3f5171219e62b214e0;p=openstack-build%2Fneutron-build.git

Only map nicira_nvp_plugin module if installed

When starting any quantum plugin agent service, only map the
nicira_nvp_plugin module if nicira is installed and configured for
quantum.

fixes bug 1175750

Change-Id: I7f2c40011363e2579d4c35716f5a7d413663a698
---

diff --git a/quantum/plugins/__init__.py b/quantum/plugins/__init__.py
index 96c08e37d..4fce72d20 100644
--- a/quantum/plugins/__init__.py
+++ b/quantum/plugins/__init__.py
@@ -17,8 +17,12 @@
 
 import sys
 
-from quantum.plugins import nicira
+# catch an import error if nicira is not the configured plugin
+try:
+    from quantum.plugins import nicira
 
-# Provide a mapping for the nicira_nvp_plugin package to ensure
-# backwards compatibilty for configuration.
-sys.modules['quantum.plugins.nicira.nicira_nvp_plugin'] = nicira
+    # Provide a mapping for the nicira_nvp_plugin package to ensure
+    # backwards compatibility for configuration.
+    sys.modules['quantum.plugins.nicira.nicira_nvp_plugin'] = nicira
+except ImportError:
+    pass