internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-07-29 10:54:44 +00:00
Code Issues Projects Releases Wiki Activity

CentOS 7 compatibility.

Browse Source 
Lowered version check to be compatible with CentOS 7.5
Added missing attributes to setup_kra to be compatible with latest python2-ipaserver librarty on CentOS 7.5 (python2-ipaserver-4.5.4-10.el7.centos.3.noarch)
This commit is contained in:
Siva Paramasivam
2018-07-06 22:13:27 -07:00
parent fb281859b6
commit 22d188fcb0
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/ipaserver/library/ipaserver_setup_ca.py
View File

@@ -188,7 +188,7 @@ def main():
# setup CA ############################################################## # setup CA ##############################################################
with redirect_stdout(ansible_log): with redirect_stdout(ansible_log):
if NUM_VERSION >= 40604: if NUM_VERSION >= 40504:
custodia = custodiainstance.get_custodia_instance( custodia = custodiainstance.get_custodia_instance(
options, custodiainstance.CustodiaModes.MASTER_PEER) options, custodiainstance.CustodiaModes.MASTER_PEER)
custodia.create_instance() custodia.create_instance()
@@ -200,7 +200,7 @@ def main():
if n in options.__dict__} if n in options.__dict__}
write_cache(cache_vars) write_cache(cache_vars)
if NUM_VERSION >= 40604: if NUM_VERSION >= 40504:
ca.install_step_0(False, None, options, custodia=custodia) ca.install_step_0(False, None, options, custodia=custodia)
else: else:
ca.install_step_0(False, None, options) ca.install_step_0(False, None, options)
@@ -225,7 +225,7 @@ def main():
if options.setup_ca: if options.setup_ca:
with redirect_stdout(ansible_log): with redirect_stdout(ansible_log):
if NUM_VERSION >= 40604: if NUM_VERSION >= 40504:
ca.install_step_1(False, None, options, custodia=custodia) ca.install_step_1(False, None, options, custodia=custodia)
else: else:
ca.install_step_1(False, None, options) ca.install_step_1(False, None, options)

5
roles/ipaserver/library/ipaserver_setup_kra.py
View File

@@ -57,6 +57,7 @@ def main():
hostname=dict(required=True), hostname=dict(required=True),
setup_ca=dict(required=True, type='bool'), setup_ca=dict(required=True, type='bool'),
setup_kra=dict(required=True, type='bool'), setup_kra=dict(required=True, type='bool'),
realm=dict(required=True),
), ),
) )
@@ -69,6 +70,8 @@ def main():
options.host_name = ansible_module.params.get('hostname') options.host_name = ansible_module.params.get('hostname')
options.setup_ca = ansible_module.params.get('setup_ca') options.setup_ca = ansible_module.params.get('setup_ca')
options.setup_kra = ansible_module.params.get('setup_kra') options.setup_kra = ansible_module.params.get('setup_kra')
options.realm_name = ansible_module.params.get('realm')
options.promote = False # first master, no promotion
# init ########################################################## # init ##########################################################
@@ -80,7 +83,7 @@ def main():
# setup kra ##################################################### # setup kra #####################################################
with redirect_stdout(ansible_log): with redirect_stdout(ansible_log):
if NUM_VERSION >= 40604: if NUM_VERSION >= 40504:
custodia = custodiainstance.get_custodia_instance( custodia = custodiainstance.get_custodia_instance(
options, custodiainstance.CustodiaModes.MASTER_PEER) options, custodiainstance.CustodiaModes.MASTER_PEER)
custodia.create_instance() custodia.create_instance()