mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-03-26 21:33:05 +00:00
ipaclient: Use paths variables for executables used in modules
paths.KDESTROY instead of "kdestroy" and paths.GETENT instead of "getent" Affected modules: roles/ipaclient/library/ipahost.py roles/ipaclient/library/ipajoin.py roles/ipaclient/library/ipanss.py
This commit is contained in:
@@ -353,7 +353,7 @@ def main():
|
||||
except Exception as e:
|
||||
module.fail_json(msg="ipahost module failed : %s" % str(e))
|
||||
finally:
|
||||
run(["kdestroy"], raiseonerr=False, env=os.environ)
|
||||
run([paths.KDESTROY], raiseonerr=False, env=os.environ)
|
||||
|
||||
module.exit_json(changed=changed, host=host)
|
||||
|
||||
|
||||
@@ -263,7 +263,7 @@ def main():
|
||||
module.log("Host is already joined")
|
||||
else:
|
||||
if principal:
|
||||
run(["kdestroy"], raiseonerr=False, env=env)
|
||||
run([paths.KDESTROY], raiseonerr=False, env=env)
|
||||
module.fail_json(msg="Joining realm failed: %s" % stderr)
|
||||
else:
|
||||
changed = True
|
||||
@@ -274,7 +274,7 @@ def main():
|
||||
module.fail_json(msg="krb5.keytab missing! Retry with ipaclient_force_join=yes to generate a new one.")
|
||||
|
||||
if principal:
|
||||
run(["kdestroy"], raiseonerr=False, env=env)
|
||||
run([paths.KDESTROY], raiseonerr=False, env=env)
|
||||
|
||||
# Obtain the TGT. We do it with the temporary krb5.conf, sot
|
||||
# tha only the KDC we're installing under is contacted.
|
||||
|
||||
@@ -288,7 +288,7 @@ def main():
|
||||
# Particulary, SSSD might take longer than 6-8 seconds.
|
||||
while n < 10 and not found:
|
||||
try:
|
||||
ipautil.run(["getent", "passwd", user])
|
||||
ipautil.run([paths.GETENT if hasattr(paths, "KDESTROY") else "getent", "passwd", user])
|
||||
found = True
|
||||
except Exception as e:
|
||||
time.sleep(1)
|
||||
|
||||
Reference in New Issue
Block a user