IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-26 00:41:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

suppress errors arising from adding existing LDAP entries during KRA install

Browse Source 
https://fedorahosted.org/freeipa/ticket/5346

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Martin Babinsky 2015-11-19 14:33:49 +01:00 committed by Jan Cholasta
parent f3076c6ab3
commit 4d59a711af
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ipaserver/install/krainstance.py
View File

@ -53,6 +53,8 @@ ADMIN_GROUPS = [
'Security Domain Administrators' 'Security Domain Administrators'
] ]
LDAPMOD_ERR_ALREADY_EXISTS = 68
class KRAInstance(DogtagInstance): class KRAInstance(DogtagInstance):
""" """
We assume that the CA has already been installed, and we use the We assume that the CA has already been installed, and we use the
@ -312,8 +314,18 @@ class KRAInstance(DogtagInstance):
conn.disconnect() conn.disconnect()
def __add_vault_container(self): def __add_vault_container(self):
self._ldap_mod('vault.ldif', {'SUFFIX': self.suffix}) try:
self.ldap_disconnect() self._ldap_mod('vault.ldif', {'SUFFIX': self.suffix},
raise_on_err=True)
except ipautil.CalledProcessError as e:
if e.returncode == LDAPMOD_ERR_ALREADY_EXISTS:
self.log.debug("Vault container already exists")
else:
self.log.error("Failed to add vault container: {0}".format(e))
finally:
# we need to disconnect from LDAP, because _ldap_mod() makes the
# connection without actually using it
self.ldap_disconnect()
def __apply_updates(self): def __apply_updates(self):
sub_dict = { sub_dict = {

4
ipaserver/install/service.py
View File

@ -184,7 +184,7 @@ class Service(object):
self.admin_conn.unbind() self.admin_conn.unbind()
self.admin_conn = None self.admin_conn = None
def _ldap_mod(self, ldif, sub_dict=None): def _ldap_mod(self, ldif, sub_dict=None, raise_on_err=False):
pw_name = None pw_name = None
fd = None fd = None
path = ipautil.SHARE_DIR + ldif path = ipautil.SHARE_DIR + ldif
@ -228,6 +228,8 @@ class Service(object):
try: try:
ipautil.run(args, nolog=nologlist) ipautil.run(args, nolog=nologlist)
except ipautil.CalledProcessError as e: except ipautil.CalledProcessError as e:
if raise_on_err:
raise
root_logger.critical("Failed to load %s: %s" % (ldif, str(e))) root_logger.critical("Failed to load %s: %s" % (ldif, str(e)))
finally: finally:
if pw_name: if pw_name: