summaryrefslogtreecommitdiffstats
path: root/ipaserver/advise
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2016-12-02 09:10:41 +0100
committerJan Cholasta <jcholast@redhat.com>2017-02-22 08:07:48 +0000
commitfe6f2b6f6effcf9f3c58e1e3f6d0874609c10c25 (patch)
treefaf107dfdb15e1eb26667620f8b0faaaf84500e2 /ipaserver/advise
parentcf25ea7e300cdada57bd964acb4393cc11ad333e (diff)
downloadfreeipa-fe6f2b6f6effcf9f3c58e1e3f6d0874609c10c25.tar.gz
freeipa-fe6f2b6f6effcf9f3c58e1e3f6d0874609c10c25.tar.xz
freeipa-fe6f2b6f6effcf9f3c58e1e3f6d0874609c10c25.zip
scripts, tests: explicitly set confdir in the rest of server code
Commit 1e6a204b4372bbbfb722a00370a5ce4e34406b9f added explicit confdir setting to api.bootstrap() calls of a randomly selected portion of server-side scripts and tests. This commit adds it to the rest of server-side code for consistency. https://fedorahosted.org/freeipa/ticket/6389 Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipaserver/advise')
-rw-r--r--ipaserver/advise/base.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/ipaserver/advise/base.py b/ipaserver/advise/base.py
index f7e8ef5e4..40dabd042 100644
--- a/ipaserver/advise/base.py
+++ b/ipaserver/advise/base.py
@@ -25,6 +25,7 @@ from textwrap import wrap
from ipalib import api
from ipalib.plugable import Plugin, API
from ipalib.errors import ValidationError
+from ipaplatform.paths import paths
from ipapython import admintool
from ipapython.ipa_log_manager import log_mgr
@@ -235,9 +236,13 @@ class IpaAdvise(admintool.AdminTool):
def run(self):
super(IpaAdvise, self).run()
- api.bootstrap(in_server=False, context='cli')
+ api.bootstrap(in_server=False,
+ context='cli',
+ confdir=paths.ETC_IPA)
api.finalize()
- advise_api.bootstrap(in_server=False, context='cli')
+ advise_api.bootstrap(in_server=False,
+ context='cli',
+ confdir=paths.ETC_IPA)
advise_api.finalize()
if not self.options.verbose:
# Do not print connection information by default