From 8cd34b4d530321ffc55511bbd91b4b995965cd46 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Thu, 11 Jul 2019 18:32:31 +0200
Subject: [PATCH] ipaserver_setup_kra: Since 4.7.1 FIRST_MASTER needs to be
used
Since 4.7.1 it is needed to use CustodiaModes.FIRST_MASTER instead of
CustodiaModes.MASTER_PEER for the get_custodia_instance.
This has been fixed already in ipaserver_setup_ca and also
ipaserver_setup_custodia, but was missed in ipaserver_setup_kra.
Fixes: #92 (KRA install fails in tasks: [ipaserver : Install - Setup KRA])
---
roles/ipaserver/library/ipaserver_setup_kra.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/roles/ipaserver/library/ipaserver_setup_kra.py b/roles/ipaserver/library/ipaserver_setup_kra.py
index fbfd1e1e..ae2946c6 100644
--- a/roles/ipaserver/library/ipaserver_setup_kra.py
+++ b/roles/ipaserver/library/ipaserver_setup_kra.py
@@ -87,9 +87,11 @@ def main():
with redirect_stdout(ansible_log):
if hasattr(custodiainstance, "get_custodia_instance"):
- custodia = custodiainstance.get_custodia_instance(
- options, custodiainstance.CustodiaModes.MASTER_PEER)
- custodia.create_instance()
+ if hasattr(custodiainstance.CustodiaModes, "FIRST_MASTER"):
+ mode = custodiainstance.CustodiaModes.FIRST_MASTER
+ else:
+ mode = custodiainstance.CustodiaModes.MASTER_PEER
+ custodia = custodiainstance.get_custodia_instance(options, mode)
kra.install(api, None, options, custodia=custodia)
else:
--
GitLab