diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2015-06-10 08:50:42 +0000 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-06-10 16:17:34 +0000 |
| commit | e7ac57e1390c76c3d7fdb2710808def107d21d6d (patch) | |
| tree | 6da3a711fc6b251f57471b53a182afff770e0b19 /ipaserver/install/server/install.py | |
| parent | cbcd86b5001039db468b46aefd83926a2b721eb5 (diff) | |
| download | freeipa-e7ac57e1390c76c3d7fdb2710808def107d21d6d.tar.gz freeipa-e7ac57e1390c76c3d7fdb2710808def107d21d6d.tar.xz freeipa-e7ac57e1390c76c3d7fdb2710808def107d21d6d.zip | |
vault: Fix ipa-kra-install
Use state in LDAP rather than local state to check if KRA is installed.
Use correct log file names.
https://fedorahosted.org/freeipa/ticket/3872
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipaserver/install/server/install.py')
| -rw-r--r-- | ipaserver/install/server/install.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index 89473dc02..bde348518 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -602,8 +602,7 @@ def install_check(installer): if setup_kra: try: - kra.install_check(None, options, False, - dogtag.install_constants.DOGTAG_VERSION) + kra.install_check(api, None, options) except RuntimeError as e: print str(e) sys.exit(1) @@ -865,7 +864,7 @@ def install(installer): http.restart() if setup_kra: - kra.install(None, options, dm_password) + kra.install(api, None, options) # Set the admin user kerberos password ds.change_admin_password(admin_password) @@ -1060,7 +1059,7 @@ def uninstall(installer): ntpinstance.NTPInstance(fstore).uninstall() - kra.uninstall() + kra.uninstall(False) ca.uninstall(dogtag_constants) |