internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-03-26 21:33:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18 from spoore1/serverforce

Browse Source 
server install force and allow_zone_overlap fixes
This commit is contained in:
Thomas Woerner
2018-02-09 16:11:48 +01:00
committed by GitHub
parent bf63b2cbc8 f3ef5f5fc8
commit 467c7764ea
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ ANSIBLE_METADATA = {
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
module: ipaserver_prepare module: ipaserver_prepare
short description: short description:
description: description:
options: options:
dm_password: dm_password:
@@ -81,6 +81,7 @@ def main():
ansible_module = AnsibleModule( ansible_module = AnsibleModule(
argument_spec = dict( argument_spec = dict(
### basic ### ### basic ###
force=dict(required=False, type='bool', default=False),
dm_password=dict(required=True, no_log=True), dm_password=dict(required=True, no_log=True),
password=dict(required=True, no_log=True), password=dict(required=True, no_log=True),
ip_addresses=dict(required=False, type='list', default=[]), ip_addresses=dict(required=False, type='list', default=[]),
@@ -130,6 +131,7 @@ def main():
# set values #################################################### # set values ####################################################
options.force = ansible_module.params.get('force')
options.dm_password = ansible_module.params.get('dm_password') options.dm_password = ansible_module.params.get('dm_password')
options.admin_password = ansible_module.params.get('password') options.admin_password = ansible_module.params.get('password')
options.ip_addresses = ansible_module_get_parsed_ip_addresses( options.ip_addresses = ansible_module_get_parsed_ip_addresses(
@@ -155,7 +157,7 @@ def main():
options.subject_base = ansible_module.params.get('subject_base') options.subject_base = ansible_module.params.get('subject_base')
options.ca_subject = ansible_module.params.get('ca_subject') options.ca_subject = ansible_module.params.get('ca_subject')
### dns ### ### dns ###
options.allow_zone_overlap= ansible_module.params.get('allow_zone_overlap') options.allow_zone_overlap = ansible_module.params.get('allow_zone_overlap')
options.reverse_zones = ansible_module.params.get('reverse_zones') options.reverse_zones = ansible_module.params.get('reverse_zones')
options.no_reverse = ansible_module.params.get('no_reverse') options.no_reverse = ansible_module.params.get('no_reverse')
options.auto_reverse = ansible_module.params.get('auto_reverse') options.auto_reverse = ansible_module.params.get('auto_reverse')

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

@@ -31,7 +31,7 @@ ANSIBLE_METADATA = {
DOCUMENTATION = ''' DOCUMENTATION = '''
--- ---
module: ipaserver_test module: ipaserver_test
short description: short description:
description: description:
options: options:
author: author:
@@ -56,6 +56,7 @@ def main():
ansible_module = AnsibleModule( ansible_module = AnsibleModule(
argument_spec = dict( argument_spec = dict(
### basic ### ### basic ###
force=dict(required=False, type='bool', default=False),
dm_password=dict(required=True, no_log=True), dm_password=dict(required=True, no_log=True),
password=dict(required=True, no_log=True), password=dict(required=True, no_log=True),
master_password=dict(required=False, no_log=True), master_password=dict(required=False, no_log=True),
@@ -128,6 +129,7 @@ def main():
# set values ############################################################ # set values ############################################################
### basic ### ### basic ###
options.force = ansible_module.params.get('force')
options.dm_password = ansible_module.params.get('dm_password') options.dm_password = ansible_module.params.get('dm_password')
options.admin_password = ansible_module.params.get('password') options.admin_password = ansible_module.params.get('password')
options.master_password = ansible_module.params.get('master_password') options.master_password = ansible_module.params.get('master_password')
@@ -174,7 +176,7 @@ def main():
options.ca_subject = ansible_module.params.get('ca_subject') options.ca_subject = ansible_module.params.get('ca_subject')
# ca_signing_algorithm # ca_signing_algorithm
### dns ### ### dns ###
options.allow_zone_overlap= ansible_module.params.get('allow_zone_overlap') options.allow_zone_overlap = ansible_module.params.get('allow_zone_overlap')
options.reverse_zones = ansible_module.params.get('reverse_zones') options.reverse_zones = ansible_module.params.get('reverse_zones')
options.no_reverse = ansible_module.params.get('no_reverse') options.no_reverse = ansible_module.params.get('no_reverse')
options.auto_reverse = ansible_module.params.get('auto_reverse') options.auto_reverse = ansible_module.params.get('auto_reverse')

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

@@ -130,6 +130,7 @@
subject_base: "{{ result_ipaserver_test.subject_base }}" subject_base: "{{ result_ipaserver_test.subject_base }}"
ca_subject: "{{ result_ipaserver_test.ca_subject }}" ca_subject: "{{ result_ipaserver_test.ca_subject }}"
### dns ### ### dns ###
allow_zone_overlap: "{{ ipaserver_allow_zone_overlap }}"
reverse_zones: "{{ result_ipaserver_test.reverse_zones }}" reverse_zones: "{{ result_ipaserver_test.reverse_zones }}"
no_reverse: "{{ ipaserver_no_reverse }}" no_reverse: "{{ ipaserver_no_reverse }}"
auto_reverse: "{{ ipaserver_auto_reverse }}" auto_reverse: "{{ ipaserver_auto_reverse }}"