From 4894441ebcea56fa9ec8479a52510f6d7c49ec80 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Mon, 25 May 2015 09:28:45 +1200
Subject: [PATCH] Do not verify requirements on extension loading

The heat gate is broken due to other libraries pinning
on pbr<1.0

Stevedore extension loading currently has verify_requirements=True.
This change removes this to use the default of False. Loading extensions
is likely the wrong place to be enforcing requirements versions of
libraries that heat depends on, so lets not do it.

This is likely to also improve heat robustness for deployments with
inconsistent dependencies, not just this current heat breakage.

Change-Id: Ifee37e00412e824eead9ba1435ea5a328ff3df58
Closes-Bug: #1458399
---
 heat/engine/clients/__init__.py   | 3 +--
 heat/engine/resources/__init__.py | 3 +--
 heat/engine/template.py           | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/heat/engine/clients/__init__.py b/heat/engine/clients/__init__.py
index b07652f4e9..71be4565ab 100644
--- a/heat/engine/clients/__init__.py
+++ b/heat/engine/clients/__init__.py
@@ -163,8 +163,7 @@ def initialise():
 
     _mgr = extension.ExtensionManager(
         namespace='heat.clients',
-        invoke_on_load=False,
-        verify_requirements=True)
+        invoke_on_load=False)
 
 
 def list_opts():
diff --git a/heat/engine/resources/__init__.py b/heat/engine/resources/__init__.py
index b639a7724e..d5079b7e44 100644
--- a/heat/engine/resources/__init__.py
+++ b/heat/engine/resources/__init__.py
@@ -37,8 +37,7 @@ def _register_stack_lifecycle_plugins(env, type_pairs):
 def _get_mapping(namespace):
     mgr = extension.ExtensionManager(
         namespace=namespace,
-        invoke_on_load=False,
-        verify_requirements=True)
+        invoke_on_load=False)
     return [[name, mgr[name].plugin] for name in mgr.names()]
 
 
diff --git a/heat/engine/template.py b/heat/engine/template.py
index 55d6c4be61..8de42c4a95 100644
--- a/heat/engine/template.py
+++ b/heat/engine/template.py
@@ -55,7 +55,6 @@ def _get_template_extension_manager():
     return extension.ExtensionManager(
         namespace='heat.templates',
         invoke_on_load=False,
-        verify_requirements=True,
         on_load_failure_callback=raise_extension_exception)