Skip to content
Snippets Groups Projects
Commit f69c13cf authored by Thomas Woerner's avatar Thomas Woerner
Browse files

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.
parent b282fc50
No related branches found
No related tags found
No related merge requests found
...@@ -209,7 +209,8 @@ def main(): ...@@ -209,7 +209,8 @@ def main():
options.domain_name = config.domain_name options.domain_name = config.domain_name
options.host_name = config.host_name options.host_name = config.host_name
options.dm_password = config.dirman_password options.dm_password = config.dirman_password
if NUM_VERSION < 40690:
if not hasattr(custodiainstance, "get_custodia_instance"):
ca.install(False, config, options) ca.install(False, config, options)
else: else:
if ca_enabled: if ca_enabled:
......
...@@ -164,7 +164,7 @@ def main(): ...@@ -164,7 +164,7 @@ def main():
with redirect_stdout(ansible_log): with redirect_stdout(ansible_log):
ansible_log.debug("-- INSTALL_CUSTODIA --") ansible_log.debug("-- INSTALL_CUSTODIA --")
if NUM_VERSION < 40690: if not hasattr(custodiainstance, "get_custodia_instance"):
custodia = custodiainstance.CustodiaInstance(config.host_name, custodia = custodiainstance.CustodiaInstance(config.host_name,
config.realm_name) config.realm_name)
if promote: if promote:
......
...@@ -216,7 +216,7 @@ def main(): ...@@ -216,7 +216,7 @@ def main():
with redirect_stdout(ansible_log): with redirect_stdout(ansible_log):
ansible_log.debug("-- INSTALL KRA --") ansible_log.debug("-- INSTALL KRA --")
if NUM_VERSION < 40690: if not hasattr(custodiainstance, "get_custodia_instance"):
kra.install(api, config, options) kra.install(api, config, options)
else: else:
if ca_enabled: if ca_enabled:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment