summaryrefslogtreecommitdiffstats
path: root/ipalib/__init__.py
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2015-06-15 11:02:07 +0000
committerJan Cholasta <jcholast@redhat.com>2015-07-01 13:05:30 +0000
commit481f8ddaa32795c64275438645e45d2c4bbbae26 (patch)
treecf779df52ac49e3db09b9bd6dc503c7946bda375 /ipalib/__init__.py
parent7715d5bb044f891dcf420f230726b72d1695edb6 (diff)
downloadfreeipa-481f8ddaa32795c64275438645e45d2c4bbbae26.tar.gz
freeipa-481f8ddaa32795c64275438645e45d2c4bbbae26.tar.xz
freeipa-481f8ddaa32795c64275438645e45d2c4bbbae26.zip
plugable: Specify plugins to import in API by module names
This change removes the automatic plugins sub-package magic and allows specifying modules in addition to packages. https://fedorahosted.org/freeipa/ticket/3090 Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Diffstat (limited to 'ipalib/__init__.py')
-rw-r--r--ipalib/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipalib/__init__.py b/ipalib/__init__.py
index cc1492570..74a812033 100644
--- a/ipalib/__init__.py
+++ b/ipalib/__init__.py
@@ -900,15 +900,15 @@ else:
class API(plugable.API):
def __init__(self, allowed):
- super(API, self).__init__(allowed, ['ipalib'])
+ super(API, self).__init__(allowed, ['ipalib.plugins.*'])
def bootstrap(self, parser=None, **overrides):
super(API, self).bootstrap(parser, **overrides)
if self.env.in_server:
- self.packages.append('ipaserver')
+ self.modules.append('ipaserver.plugins.*')
if self.env.context in ('installer', 'updates'):
- self.packages.append('ipaserver/install/plugins')
+ self.modules.append('ipaserver.install.plugins.*')
def create_api(mode='dummy'):