From f69c13cfd652f7121858fe1ebeaa46d770450467 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Mon, 9 Jul 2018 13:47:09 +0200
Subject: [PATCH] ipareplica: Do no use IPA version to check for
get_custodia_instance existance
The use of IPA versions to determine if get_custodia_instance should be
used was not optimal as the patch that introduced this has been back-ported
to the EL-7 package with verion 4.5.4. As get_custodia_instance was not
available before we can simply check if get_custodia_instance exists in
custodiainstance.
---
roles/ipareplica/library/ipareplica_setup_ca.py | 3 ++-
roles/ipareplica/library/ipareplica_setup_custodia.py | 2 +-
roles/ipareplica/library/ipareplica_setup_kra.py | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/roles/ipareplica/library/ipareplica_setup_ca.py b/roles/ipareplica/library/ipareplica_setup_ca.py
index f4de7592..c1f05b49 100644
--- a/roles/ipareplica/library/ipareplica_setup_ca.py
+++ b/roles/ipareplica/library/ipareplica_setup_ca.py
@@ -209,7 +209,8 @@ def main():
options.domain_name = config.domain_name
options.host_name = config.host_name
options.dm_password = config.dirman_password
- if NUM_VERSION < 40690:
+
+ if not hasattr(custodiainstance, "get_custodia_instance"):
ca.install(False, config, options)
else:
if ca_enabled:
diff --git a/roles/ipareplica/library/ipareplica_setup_custodia.py b/roles/ipareplica/library/ipareplica_setup_custodia.py
index 37b11f1f..a7fcc407 100644
--- a/roles/ipareplica/library/ipareplica_setup_custodia.py
+++ b/roles/ipareplica/library/ipareplica_setup_custodia.py
@@ -164,7 +164,7 @@ def main():
with redirect_stdout(ansible_log):
ansible_log.debug("-- INSTALL_CUSTODIA --")
- if NUM_VERSION < 40690:
+ if not hasattr(custodiainstance, "get_custodia_instance"):
custodia = custodiainstance.CustodiaInstance(config.host_name,
config.realm_name)
if promote:
diff --git a/roles/ipareplica/library/ipareplica_setup_kra.py b/roles/ipareplica/library/ipareplica_setup_kra.py
index b585cb17..adcdb228 100644
--- a/roles/ipareplica/library/ipareplica_setup_kra.py
+++ b/roles/ipareplica/library/ipareplica_setup_kra.py
@@ -216,7 +216,7 @@ def main():
with redirect_stdout(ansible_log):
ansible_log.debug("-- INSTALL KRA --")
- if NUM_VERSION < 40690:
+ if not hasattr(custodiainstance, "get_custodia_instance"):
kra.install(api, config, options)
else:
if ca_enabled:
--
GitLab