From ebce1ace1a7e23f594884a389ed99d3fc58f354c Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 26 Mar 2019 13:04:13 +0100
Subject: [PATCH] ipareplica_setup_krb: Use inspect on install_krb
The promote argument has been dropped with the final removal of domain
level 0 support in version 4.7.1. The fstore argument has been added
with the 4.7.1 version also.
---
.../library/ipareplica_setup_krb.py | 24 +++++++++++++++----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/roles/ipareplica/library/ipareplica_setup_krb.py b/roles/ipareplica/library/ipareplica_setup_krb.py
index a5c19520..b5dd1d7f 100644
--- a/roles/ipareplica/library/ipareplica_setup_krb.py
+++ b/roles/ipareplica/library/ipareplica_setup_krb.py
@@ -145,11 +145,25 @@ def main():
ansible_log.debug("-- INSTALL_KRB --")
with redirect_stdout(ansible_log):
- krb = install_krb(
- config,
- setup_pkinit=not options.no_pkinit,
- pkcs12_info=pkinit_pkcs12_info,
- promote=promote)
+ argspec = inspect.getargspec(install_krb)
+ if "promote" in argspec.args:
+ krb = install_krb(
+ config,
+ setup_pkinit=not options.no_pkinit,
+ pkcs12_info=pkinit_pkcs12_info,
+ promote=promote)
+ else:
+ if "fstore" not in argspec.args:
+ krb = install_krb(
+ config,
+ setup_pkinit=not options.no_pkinit,
+ pkcs12_info=pkinit_pkcs12_info)
+ else:
+ krb = install_krb(
+ config,
+ setup_pkinit=not options.no_pkinit,
+ pkcs12_info=pkinit_pkcs12_info,
+ fstore=fstore)
# done #
--
GitLab