From c8be120e7841a159eb6208d09f4e6d7820291143 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Mon, 9 Jul 2018 13:07:47 +0200
Subject: [PATCH] ipaserver: 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/ipaserver/library/ipaserver_setup_ca.py | 6 +++---
roles/ipaserver/library/ipaserver_setup_kra.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/roles/ipaserver/library/ipaserver_setup_ca.py b/roles/ipaserver/library/ipaserver_setup_ca.py
index ed1bd41f..ffe214c6 100644
--- a/roles/ipaserver/library/ipaserver_setup_ca.py
+++ b/roles/ipaserver/library/ipaserver_setup_ca.py
@@ -188,7 +188,7 @@ def main():
# setup CA ##############################################################
with redirect_stdout(ansible_log):
- if NUM_VERSION >= 40504:
+ if hasattr(custodiainstance, "get_custodia_instance"):
custodia = custodiainstance.get_custodia_instance(
options, custodiainstance.CustodiaModes.MASTER_PEER)
custodia.create_instance()
@@ -200,7 +200,7 @@ def main():
if n in options.__dict__}
write_cache(cache_vars)
- if NUM_VERSION >= 40504:
+ if hasattr(custodiainstance, "get_custodia_instance"):
ca.install_step_0(False, None, options, custodia=custodia)
else:
ca.install_step_0(False, None, options)
@@ -225,7 +225,7 @@ def main():
if options.setup_ca:
with redirect_stdout(ansible_log):
- if NUM_VERSION >= 40504:
+ if hasattr(custodiainstance, "get_custodia_instance"):
ca.install_step_1(False, None, options, custodia=custodia)
else:
ca.install_step_1(False, None, options)
diff --git a/roles/ipaserver/library/ipaserver_setup_kra.py b/roles/ipaserver/library/ipaserver_setup_kra.py
index 2ae0544d..c1776a16 100644
--- a/roles/ipaserver/library/ipaserver_setup_kra.py
+++ b/roles/ipaserver/library/ipaserver_setup_kra.py
@@ -83,7 +83,7 @@ def main():
# setup kra #####################################################
with redirect_stdout(ansible_log):
- if NUM_VERSION >= 40504:
+ if hasattr(custodiainstance, "get_custodia_instance"):
custodia = custodiainstance.get_custodia_instance(
options, custodiainstance.CustodiaModes.MASTER_PEER)
custodia.create_instance()
--
GitLab