internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-06-23 01:04:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31 from apsivam/master

Browse Source 
CentOS 7 Compatibility
This commit is contained in:
Thomas Woerner
2018-07-09 12:15:44 +02:00
committed by GitHub
parent fb281859b6 2f3ee6dc29
commit 606603f4cc
6 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/ipaclient/vars/CentOS-7.yml Normal file
View File

@@ -0,0 +1,4 @@
# defaults file for ipaclient
# vars/rhel.yml
ipaclient_packages: [ "ipa-client", "libselinux-python" ]
#ansible_python_interpreter: '/usr/bin/python2'

5
roles/ipareplica/vars/CentOS-7.yml Normal file
View File

@@ -0,0 +1,5 @@
# defaults file for ipareplica
# vars/RedHat-7.yml
ipareplica_packages: [ "ipa-server", "libselinux-python" ]
ipareplica_packages_dns: [ "ipa-server-dns" ]
ipareplica_packages_adtrust: [ "ipa-server-trust-ad" ]

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()

1
roles/ipaserver/tasks/install.yml
View File

@@ -287,6 +287,7 @@
setup_ca: "{{ result_ipaserver_test.setup_ca }}" setup_ca: "{{ result_ipaserver_test.setup_ca }}"
dm_password: "{{ ipadm_password }}" dm_password: "{{ ipadm_password }}"
setup_kra: "{{ result_ipaserver_test.setup_kra }}" setup_kra: "{{ result_ipaserver_test.setup_kra }}"
realm: "{{ result_ipaserver_test.realm }}"
when: result_ipaserver_test.setup_kra | bool when: result_ipaserver_test.setup_kra | bool
- name: Install - Setup DNS - name: Install - Setup DNS

5
roles/ipaserver/vars/CentOS-7.yml Normal file
View File

@@ -0,0 +1,5 @@
# defaults file for ipaserver
# vars/rhel.yml
ipaserver_packages: [ "ipa-server", "libselinux-python" ]
ipaserver_packages_dns: [ "ipa-server-dns" ]
ipaserver_packages_adtrust: [ "ipa-server-trust-ad" ]