From 285790231a69bfbda9c956537b4dc67dbba09db0 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Thu, 21 Jun 2018 12:48:24 +0200
Subject: [PATCH] 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
---
roles/ipaclient/library/ipahost.py | 2 +-
roles/ipaclient/library/ipajoin.py | 4 ++--
roles/ipaclient/library/ipanss.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/ipaclient/library/ipahost.py b/roles/ipaclient/library/ipahost.py
index 274cb699..68904e3d 100644
--- a/roles/ipaclient/library/ipahost.py
+++ b/roles/ipaclient/library/ipahost.py
@@ -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)
diff --git a/roles/ipaclient/library/ipajoin.py b/roles/ipaclient/library/ipajoin.py
index e559f3cf..11a3fc14 100644
--- a/roles/ipaclient/library/ipajoin.py
+++ b/roles/ipaclient/library/ipajoin.py
@@ -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.
diff --git a/roles/ipaclient/library/ipanss.py b/roles/ipaclient/library/ipanss.py
index 09b37fe5..41ff894e 100644
--- a/roles/ipaclient/library/ipanss.py
+++ b/roles/ipaclient/library/ipanss.py
@@ -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)
--
GitLab