diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-12-20 14:51:40 +0100 |
|---|---|---|
| committer | Martin Babinsky <mbabinsk@redhat.com> | 2016-12-20 16:26:28 +0100 |
| commit | 998c87af2b7b2c704d34dd27fe99bda495a59e23 (patch) | |
| tree | 6c8a83e254282af35274c3071cf6655f02825c4b /ipaserver | |
| parent | 4028ad73e74fe62bd4871e842dbb69ff660125f9 (diff) | |
| download | freeipa-998c87af2b7b2c704d34dd27fe99bda495a59e23.tar.gz freeipa-998c87af2b7b2c704d34dd27fe99bda495a59e23.tar.xz freeipa-998c87af2b7b2c704d34dd27fe99bda495a59e23.zip | |
server install: fix KRA agent PEM file not being created
In commit 822e1bc82af3a6c1556546c4fbe96eeafad45762 the call to create the
KRA agent PEM file was accidentally removed from the server installer.
Call into the KRA installer from the server installer to create the file
again.
https://fedorahosted.org/freeipa/ticket/6392
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/ipa_kra_install.py | 1 | ||||
| -rw-r--r-- | ipaserver/install/kra.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/server/install.py | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/ipaserver/install/ipa_kra_install.py b/ipaserver/install/ipa_kra_install.py index a545f2ba5..340a9930c 100644 --- a/ipaserver/install/ipa_kra_install.py +++ b/ipaserver/install/ipa_kra_install.py @@ -181,6 +181,7 @@ class KRAInstaller(KRAInstall): self.options.dm_password = self.options.password self.options.setup_ca = False + self.options.setup_kra = True api.Backend.ldap2.connect() diff --git a/ipaserver/install/kra.py b/ipaserver/install/kra.py index e7e11dd41..0d1ed8e5c 100644 --- a/ipaserver/install/kra.py +++ b/ipaserver/install/kra.py @@ -77,7 +77,7 @@ def install(api, replica_config, options): pkcs12_info = None master_host = None - ra_only = False + ra_only = not options.setup_kra promote = False else: krafile = os.path.join(replica_config.dir, 'kracert.p12') diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index b5b9cb48a..fc319d916 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -609,6 +609,7 @@ def install_check(installer): if setup_ca: ca.install_check(False, None, options) + kra.install_check(api, None, options) if options.setup_dns: dns.install_check(False, api, False, options, host_name) @@ -809,6 +810,7 @@ def install(installer): if setup_ca: ca.install_step_1(False, None, options) + kra.install(api, None, options) # The DS instance is created before the keytab, add the SSL cert we # generated |