internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-31 11:54:47 +00:00
Code Issues Projects Releases Wiki Activity

ipaclient: Fix issues with FreeIPA 4.6 and prior

Browse Source 
check_ldap_conf is only available in FreeIPA 4.7 and later and
tasks.is_nosssd_supported is only available since 4.6.90.pre2.

check_ldap_conf is None (ansible_ipa_client) if it can not be imported.
hasattr has been added to check if is_nosssd_supported is a valid
attribute in tasks.

Fixes: #61 (ipaserver role - Fails on ipaclient install)
This commit is contained in:
Thomas Woerner
2019-04-04 17:28:37 +02:00
parent 818db5cb4d
commit 15f650ccaa
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
roles/ipaclient/library/ipaclient_test.py
View File

@@ -484,7 +484,8 @@ def main():
# "IPA client is already configured on this system.", # "IPA client is already configured on this system.",
# rval=CLIENT_ALREADY_CONFIGURED) # rval=CLIENT_ALREADY_CONFIGURED)
check_ldap_conf() if check_ldap_conf is not None:
check_ldap_conf()
if options.conf_ntp: if options.conf_ntp:
try: try:
@@ -526,21 +527,22 @@ def main():
"Invalid hostname, '{}' must not be used.".format(hostname), "Invalid hostname, '{}' must not be used.".format(hostname),
rval=CLIENT_INSTALL_ERROR) rval=CLIENT_INSTALL_ERROR)
# --no-sssd is not supported any more for rhel-based distros if hasattr(tasks, "is_nosssd_supported"):
if not tasks.is_nosssd_supported() and not options.sssd: # --no-sssd is not supported any more for rhel-based distros
raise ScriptError( if not tasks.is_nosssd_supported() and not options.sssd:
"Option '--no-sssd' is incompatible with the 'authselect' tool " raise ScriptError(
"provided by this distribution for configuring system " "Option '--no-sssd' is incompatible with the 'authselect' tool "
"authentication resources", "provided by this distribution for configuring system "
rval=CLIENT_INSTALL_ERROR) "authentication resources",
rval=CLIENT_INSTALL_ERROR)
# --noac is not supported any more for rhel-based distros # --noac is not supported any more for rhel-based distros
if not tasks.is_nosssd_supported() and options.no_ac: if not tasks.is_nosssd_supported() and options.no_ac:
raise ScriptError( raise ScriptError(
"Option '--noac' is incompatible with the 'authselect' tool " "Option '--noac' is incompatible with the 'authselect' tool "
"provided by this distribution for configuring system " "provided by this distribution for configuring system "
"authentication resources", "authentication resources",
rval=CLIENT_INSTALL_ERROR) rval=CLIENT_INSTALL_ERROR)
# when installing with '--no-sssd' option, check whether nss-ldap is # when installing with '--no-sssd' option, check whether nss-ldap is
# installed # installed