diff options
author | Tomas Babej <tbabej@redhat.com> | 2014-05-29 10:18:21 +0200 |
---|---|---|
committer | Petr Viktorin <pviktori@redhat.com> | 2014-06-16 19:48:19 +0200 |
commit | 926f8647d2a676c1dd2e446633eb76cdf1a7bf0c (patch) | |
tree | 06c6519941bba3814a4e41d72580db8fd2814421 /install/tools/ipactl | |
parent | a7c2327a366d2dfbbdde5362e957fad23e233105 (diff) | |
download | freeipa-926f8647d2a676c1dd2e446633eb76cdf1a7bf0c.tar.gz freeipa-926f8647d2a676c1dd2e446633eb76cdf1a7bf0c.tar.xz freeipa-926f8647d2a676c1dd2e446633eb76cdf1a7bf0c.zip |
ipaplatform: Change platform dependant code in freeipa to use ipaplatform tasks
https://fedorahosted.org/freeipa/ticket/4052
Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'install/tools/ipactl')
-rwxr-xr-x | install/tools/ipactl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/install/tools/ipactl b/install/tools/ipactl index fd2913227..77e6ebd7e 100755 --- a/install/tools/ipactl +++ b/install/tools/ipactl @@ -32,6 +32,7 @@ from ipapython.ipaldap import IPAdmin from ipapython.ipautil import wait_for_open_ports, wait_for_open_socket from ipapython import services as ipaservices from ipapython import config, dogtag +from ipaplatform import tasks from ipapython.dn import DN class IpactlError(ScriptError): @@ -171,7 +172,7 @@ def get_config_from_file(): svc_list = [] try: - f = open(ipaservices.get_svc_list_file(), 'r') + f = open(tasks.get_svc_list_file(), 'r') svc_list = json.load(f) except Exception, e: raise IpactlError("Unknown error when retrieving list of services from file: " + str(e)) @@ -211,7 +212,7 @@ def stop_dirsrv(dirsrv): def ipa_start(options): - if os.path.isfile(ipaservices.get_svc_list_file()): + if os.path.isfile(tasks.get_svc_list_file()): emit_err("Existing service file detected!") emit_err("Assuming stale, cleaning and proceeding") # remove file with list of started services @@ -429,7 +430,7 @@ def ipa_status(options): else: svc_list = get_config_from_file() except IpactlError, e: - if os.path.exists(ipaservices.get_svc_list_file()): + if os.path.exists(tasks.get_svc_list_file()): raise e else: svc_list = [] |