Fix lp795123 and lp795126 by making _check_extension() return True or False and checking the result only from the top of _add_extension()

1 files changed, 6 insertions, 3 deletions

diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py
index 54e17e23d..28d9d9192 100644
--- a/nova/api/openstack/extensions.py
+++ b/nova/api/openstack/extensions.py
@@ -374,6 +374,8 @@ class ExtensionManager(object):
             LOG.debug(_('Ext updated: %s'), extension.get_updated())
         except AttributeError as ex:
             LOG.exception(_("Exception loading extension: %s"), unicode(ex))
+            return False
+        return True
 
     def _load_all_extensions(self):
         """Load extensions from the configured path.
@@ -412,15 +414,16 @@ class ExtensionManager(object):
                               'file': ext_path})
                     continue
                 new_ext = new_ext_class()
-                self._check_extension(new_ext)
                 self._add_extension(new_ext)
 
     def _add_extension(self, ext):
+        # Do nothing if the extension doesn't check out
+        if not self._check_extension(ext):
+            return
+
         alias = ext.get_alias()
         LOG.audit(_('Loaded extension: %s'), alias)
 
-        self._check_extension(ext)
-
         if alias in self.extensions:
             raise exception.Error("Found duplicate extension: %s" % alias)
         self.extensions[alias] = ext