From cb7f6b7be273618902b22ce8b1e24f5d30d777ff Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Wed, 8 Aug 2018 14:05:21 +0200 Subject: [PATCH] replicainstall: Make sure that domain fulfills minimal domain level requirement The old domain level check to suggest to use ipa-replica-prepare has been converted to make sure that domain fulfills minimal domain level requirement (no DL0). See: https://pagure.io/freeipa/issue/7669 Signed-off-by: Thomas Woerner Reviewed-By: Christian Heimes --- ipaserver/install/server/replicainstall.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index a7ad1ded1..1903f9df9 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -1153,13 +1153,17 @@ def promote_check(installer): promotion_check_ipa_domain(conn, remote_api.env.basedn) + # Make sure that domain fulfills minimal domain level + # requirement domain_level = current_domain_level(remote_api) check_domain_level_is_supported(domain_level) - if domain_level < constants.DOMAIN_LEVEL_1: + if domain_level < constants.MIN_DOMAIN_LEVEL: raise RuntimeError( - "You must provide a file generated by ipa-replica-prepare to " - "create a replica when the domain is at level 0." - ) + "Cannot promote this client to a replica. The domain level " + "must be raised to {mindomainlevel} before the replica can be " + "installed".format( + mindomainlevel=constants.MIN_DOMAIN_LEVEL + )) # Check authorization result = remote_api.Command['hostgroup_find'](