diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-10-26 14:28:21 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2016-11-11 12:13:56 +0100 |
| commit | 822e1bc82af3a6c1556546c4fbe96eeafad45762 (patch) | |
| tree | 14c8eee953dc14fd0bfa0049b817b3b18c20402e /ipaserver/install/custodiainstance.py | |
| parent | bddd4fac462c07458297d1cea5272bde97fb3707 (diff) | |
| download | freeipa-822e1bc82af3a6c1556546c4fbe96eeafad45762.tar.gz freeipa-822e1bc82af3a6c1556546c4fbe96eeafad45762.tar.xz freeipa-822e1bc82af3a6c1556546c4fbe96eeafad45762.zip | |
replica install: merge RA cert import into CA install
Merge all RA cert import code paths into a single code path in CA install.
https://fedorahosted.org/freeipa/ticket/6392
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipaserver/install/custodiainstance.py')
| -rw-r--r-- | ipaserver/install/custodiainstance.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ipaserver/install/custodiainstance.py b/ipaserver/install/custodiainstance.py index 7d2082ca2..50efab446 100644 --- a/ipaserver/install/custodiainstance.py +++ b/ipaserver/install/custodiainstance.py @@ -22,7 +22,7 @@ import pwd class CustodiaInstance(SimpleServiceInstance): - def __init__(self, host_name=None, realm=None, ca_is_configured=True): + def __init__(self, host_name=None, realm=None): super(CustodiaInstance, self).__init__("ipa-custodia") self.config_file = paths.IPA_CUSTODIA_CONF self.server_keys = os.path.join(paths.IPA_CUSTODIA_CONF_DIR, @@ -30,7 +30,6 @@ class CustodiaInstance(SimpleServiceInstance): self.ldap_uri = None self.fqdn = host_name self.realm = realm - self.ca_is_configured = ca_is_configured self.__CustodiaClient = functools.partial( CustodiaClient, client_service='host@%s' % self.fqdn, @@ -86,8 +85,6 @@ class CustodiaInstance(SimpleServiceInstance): self.step("Generating ipa-custodia config file", self.__config_file) self.step("Generating ipa-custodia keys", self.__gen_keys) - if self.ca_is_configured: - self.step("Importing RA Key", self.__import_ra_key) super(CustodiaInstance, self).create_instance(gensvc_name='KEYS', fqdn=self.fqdn, ldap_suffix=suffix, @@ -105,8 +102,8 @@ class CustodiaInstance(SimpleServiceInstance): updater = ldapupdate.LDAPUpdate(sub_dict=sub_dict) updater.update([os.path.join(paths.UPDATES_DIR, '73-custodia.update')]) - def __import_ra_key(self): - cli = self.__CustodiaClient(server=self.master_host_name) + def import_ra_key(self, master_host_name): + cli = self.__CustodiaClient(server=master_host_name) cli.fetch_key('ra/ipaCert') def import_dm_password(self, master_host_name): |