mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-05-06 13:23:14 +00:00
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.
This commit is contained in:
@@ -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:
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user