IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update check_client_configuration to use new client fact

Browse Source 
check_client_configuration differs from is_ipa_client_configured
in that it raises an exception if not configured so is a nice
convenience in AdminTool scripts. Port it to call to
is_ipa_client_configured() instead of determining the install
state on its own.

https://pagure.io/freeipa/issue/8384

Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Francois Cami <fcami@redhat.com>
This commit is contained in:
Rob Crittenden 2020-07-09 10:38:42 -04:00 committed by Florence Blanc-Renaud
parent 5e02713481
commit 2c3a042c06
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ipalib/util.py
View File

@ -60,6 +60,8 @@ from ipalib.constants import (
TLS_VERSIONS, TLS_VERSION_MINIMAL, TLS_VERSION_MAXIMAL, TLS_VERSIONS, TLS_VERSION_MINIMAL, TLS_VERSION_MAXIMAL,
TLS_VERSION_DEFAULT_MIN, TLS_VERSION_DEFAULT_MAX, TLS_VERSION_DEFAULT_MIN, TLS_VERSION_DEFAULT_MAX,
) )
# pylint: disable=ipa-forbidden-import
from ipalib.facts import is_ipa_client_configured
from ipalib.text import _ from ipalib.text import _
from ipaplatform.constants import constants from ipaplatform.constants import constants
from ipaplatform.paths import paths from ipaplatform.paths import paths
@ -1174,6 +1176,12 @@ def check_client_configuration(env=None):
""" """
Check if IPA client is configured on the system. Check if IPA client is configured on the system.
This is a convenience wrapper that also supports using
a custom configuration via IPA_CONFDIR.
Raises a ScriptError exception if the client is not
configured.
Hardcode return code to avoid recursive imports Hardcode return code to avoid recursive imports
""" """
CLIENT_NOT_CONFIGURED = 2 CLIENT_NOT_CONFIGURED = 2
@ -1187,16 +1195,10 @@ def check_client_configuration(env=None):
f'{env.confdir} is missing {env.conf_default})', f'{env.confdir} is missing {env.conf_default})',
CLIENT_NOT_CONFIGURED CLIENT_NOT_CONFIGURED
) )
elif (
os.path.isfile(paths.IPA_DEFAULT_CONF) and if is_ipa_client_configured():
os.path.isfile(
os.path.join(paths.IPA_CLIENT_SYSRESTORE, 'sysrestore.state')
)
):
# standard installation, check for config and client sysrestore state
return True return True
else: else:
# client not configured
raise ScriptError( raise ScriptError(
'IPA client is not configured on this system', 'IPA client is not configured on this system',
CLIENT_NOT_CONFIGURED CLIENT_NOT_CONFIGURED