From: Zane Bitter <zbitter@redhat.com>
Date: Fri, 30 Nov 2012 09:01:49 +0000 (+0100)
Subject: Add a plugin directory for Resources
X-Git-Tag: 2014.1~1142
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8083a534fe86ccbf866ecd0be000b2b6b595c0ac;p=openstack-build%2Fheat-build.git

Add a plugin directory for Resources

bug 1072903

Change-Id: I0f218c47620d50dc52bd931ee266f4dc19d701ed
Signed-off-by: Zane Bitter <zbitter@redhat.com>
---

diff --git a/heat/common/config.py b/heat/common/config.py
index 8b9daa17..f3947e8f 100644
--- a/heat/common/config.py
+++ b/heat/common/config.py
@@ -100,7 +100,10 @@ cfg.IntOpt('sql_idle_timeout',
 engine_opts = [
 cfg.StrOpt('instance_driver',
            default='heat.engine.nova',
-           help='Driver to use for controlling instances')
+           help='Driver to use for controlling instances'),
+cfg.ListOpt('plugin_dirs',
+            default=['/usr/lib64/heat', '/usr/lib/heat'],
+            help='List of directories to search for Plugins'),
 ]
 rpc_opts = [
 cfg.StrOpt('host',
diff --git a/heat/engine/resources/__init__.py b/heat/engine/resources/__init__.py
index 087ac64e..803b84ae 100644
--- a/heat/engine/resources/__init__.py
+++ b/heat/engine/resources/__init__.py
@@ -44,5 +44,11 @@ def _initialise():
 
     _register_modules(plugin_loader.load_modules(sys.modules[__name__]))
 
+    from heat.openstack.common import cfg
+
+    plugin_pkg = plugin_loader.create_subpackage(cfg.CONF.plugin_dirs,
+                                                 'heat.engine')
+    _register_modules(plugin_loader.load_modules(plugin_pkg, True))
+
 
 _initialise()