From 6d868b2dd17ada072553c8d7440ee6fbd95a052a Mon Sep 17 00:00:00 2001 From: Fraser Tweedale Date: Mon, 16 Apr 2018 16:02:03 +1000 Subject: [PATCH] Fix upgrade (update_replica_config) in single master mode Commit afc0d4b62d043cd568ce87400f60e8fa8273495f added an upgrade step that add an attribute to a replica config entry. The entry only exists after a replica has been added, so upgrade was broken for standalone server. Catch and suppress the NotFound error. Related to: https://pagure.io/freeipa/issue/7488 Reviewed-By: Christian Heimes Reviewed-By: Fraser Tweedale Reviewed-By: Florence Blanc-Renaud --- ipaserver/install/server/upgrade.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py index 62a75510ad331923f468c28908ea407789ec380c..c55242a4af990c3218d8451fac7b082066a23be3 100644 --- a/ipaserver/install/server/upgrade.py +++ b/ipaserver/install/server/upgrade.py @@ -1570,7 +1570,11 @@ def update_replica_config(db_suffix): ('cn', 'replica'), ('cn', db_suffix), ('cn', 'mapping tree'), ('cn', 'config') ) - entry = api.Backend.ldap2.get_entry(dn) + try: + entry = api.Backend.ldap2.get_entry(dn) + except ipalib.errors.NotFound: + return # entry does not exist until a replica is installed + if 'nsds5replicareleasetimeout' not in entry: # See https://pagure.io/freeipa/issue/7488 root_logger.info("Adding nsds5replicaReleaseTimeout=60 to %s", dn) -- 2.14.3