diff --git a/roles/ipaserver/library/ipaserver_prepare.py b/roles/ipaserver/library/ipaserver_prepare.py index 7d11c5a6ffd710de0fcfa7443d3b94ea16432267..c8d9c3c272c7d53ecbf3518ba12bd04553a035c1 100644 --- a/roles/ipaserver/library/ipaserver_prepare.py +++ b/roles/ipaserver/library/ipaserver_prepare.py @@ -33,7 +33,7 @@ ANSIBLE_METADATA = { DOCUMENTATION = ''' --- module: ipaserver_prepare -short description: +short description: description: options: dm_password: @@ -81,6 +81,7 @@ def main(): ansible_module = AnsibleModule( argument_spec = dict( ### basic ### + force=dict(required=False, type='bool', default=False), dm_password=dict(required=True, no_log=True), password=dict(required=True, no_log=True), ip_addresses=dict(required=False, type='list', default=[]), @@ -130,6 +131,7 @@ def main(): # set values #################################################### + options.force = ansible_module.params.get('force') options.dm_password = ansible_module.params.get('dm_password') options.admin_password = ansible_module.params.get('password') 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.ca_subject = ansible_module.params.get('ca_subject') ### 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.no_reverse = ansible_module.params.get('no_reverse') options.auto_reverse = ansible_module.params.get('auto_reverse') diff --git a/roles/ipaserver/library/ipaserver_test.py b/roles/ipaserver/library/ipaserver_test.py index 97aee1c1c15639a5e846e2bcddd2f97df5c4a142..dd338b7b8bde95b0df1bac136b3c69bc508b337d 100644 --- a/roles/ipaserver/library/ipaserver_test.py +++ b/roles/ipaserver/library/ipaserver_test.py @@ -31,7 +31,7 @@ ANSIBLE_METADATA = { DOCUMENTATION = ''' --- module: ipaserver_test -short description: +short description: description: options: author: @@ -56,6 +56,7 @@ def main(): ansible_module = AnsibleModule( argument_spec = dict( ### basic ### + force=dict(required=False, type='bool', default=False), dm_password=dict(required=True, no_log=True), password=dict(required=True, no_log=True), master_password=dict(required=False, no_log=True), @@ -128,6 +129,7 @@ def main(): # set values ############################################################ ### basic ### + options.force = ansible_module.params.get('force') options.dm_password = ansible_module.params.get('dm_password') options.admin_password = ansible_module.params.get('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') # ca_signing_algorithm ### 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.no_reverse = ansible_module.params.get('no_reverse') options.auto_reverse = ansible_module.params.get('auto_reverse') diff --git a/roles/ipaserver/tasks/install.yml b/roles/ipaserver/tasks/install.yml index a4812ae2d8a6c1cb1cb050bd8428d5871d3bdbc0..f621ecada80cf921a5e8508d6711bbe43a7fd1ce 100644 --- a/roles/ipaserver/tasks/install.yml +++ b/roles/ipaserver/tasks/install.yml @@ -130,6 +130,7 @@ subject_base: "{{ result_ipaserver_test.subject_base }}" ca_subject: "{{ result_ipaserver_test.ca_subject }}" ### dns ### + allow_zone_overlap: "{{ ipaserver_allow_zone_overlap }}" reverse_zones: "{{ result_ipaserver_test.reverse_zones }}" no_reverse: "{{ ipaserver_no_reverse }}" auto_reverse: "{{ ipaserver_auto_reverse }}"