diff options
author | Jan Cholasta <jcholast@redhat.com> | 2016-04-28 10:30:05 +0200 |
---|---|---|
committer | Jan Cholasta <jcholast@redhat.com> | 2016-06-03 09:00:34 +0200 |
commit | 6e44557b601f769d23ee74555a72e8b5cc62c0c9 (patch) | |
tree | eedd3e054b0709341b9f58c190ea54f999f7d13a /ipaserver/plugins/dogtag.py | |
parent | ec841e5d7ab29d08de294b3fa863a631cd50e30a (diff) | |
download | freeipa-6e44557b601f769d23ee74555a72e8b5cc62c0c9.tar.gz freeipa-6e44557b601f769d23ee74555a72e8b5cc62c0c9.tar.xz freeipa-6e44557b601f769d23ee74555a72e8b5cc62c0c9.zip |
ipalib: move server-side plugins to ipaserver
Move the remaining plugin code from ipalib.plugins to ipaserver.plugins.
Remove the now unused ipalib.plugins package.
https://fedorahosted.org/freeipa/ticket/4739
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipaserver/plugins/dogtag.py')
-rw-r--r-- | ipaserver/plugins/dogtag.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py index 8836e70dc..197814c4d 100644 --- a/ipaserver/plugins/dogtag.py +++ b/ipaserver/plugins/dogtag.py @@ -244,19 +244,21 @@ import json from lxml import etree import time -import pki -from pki.client import PKIConnection -import pki.crypto as cryptoutil -from pki.kra import KRAClient import six from six.moves import urllib -from ipalib import Backend +from ipalib import Backend, api from ipapython.dn import DN import ipapython.cookie from ipapython import dogtag from ipapython import ipautil +if api.env.in_server: + import pki + from pki.client import PKIConnection + import pki.crypto as cryptoutil + from pki.kra import KRAClient + if six.PY3: unicode = str @@ -1269,7 +1271,7 @@ def select_any_master(ldap2, service='CA'): #------------------------------------------------------------------------------- -from ipalib import Registry, api, errors, SkipPluginModule +from ipalib import Registry, errors, SkipPluginModule if api.env.ra_plugin != 'dogtag': # In this case, abort loading this plugin module... raise SkipPluginModule(reason='dogtag not selected as RA plugin') |