mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-05-15 05:52:24 +00:00
ipaserver_setup_adtrust: Add missing settings for adtrust and module
There have been missing settings that have not been provided to ipaserver_setup_adtrust. These are: enable_compat, rid_base and secondary_rid_base. The settings rid_base and secondary_rid_base are now initialized in ipaserver_test and propagated in the results. The two settings netbios_name and reset_netbios_name are placed in the adtrust binding in the adtrust.install_check call. These are now saved when ipaserver_test finishes and are written back in the fist steps of ipaserver_setup_adtrust to make adtrust.install working. The settings add_sids and add_agents are now initialized in ansible_ipa_server in the same way as in ServerMasterInstall. These settings are fixed in the server deployment.
This commit is contained in:
@@ -54,8 +54,15 @@ def main():
|
||||
argument_spec = dict(
|
||||
# basic
|
||||
hostname=dict(required=False),
|
||||
setup_ca=dict(required=True, type='bool', default=False),
|
||||
setup_adtrust=dict(required=True, type='bool', default=False),
|
||||
setup_ca=dict(required=False, type='bool', default=False),
|
||||
setup_adtrust=dict(required=False, type='bool', default=False),
|
||||
### ad trust ###
|
||||
enable_compat=dict(required=False, type='bool', default=False),
|
||||
rid_base=dict(required=False, type='int'),
|
||||
secondary_rid_base=dict(required=False, type='int'),
|
||||
### additional ###
|
||||
adtrust_netbios_name=dict(required=True),
|
||||
adtrust_reset_netbios_name=dict(required=True, type='bool')
|
||||
),
|
||||
)
|
||||
|
||||
@@ -67,6 +74,14 @@ def main():
|
||||
options.host_name = ansible_module.params.get('hostname')
|
||||
options.setup_ca = ansible_module.params.get('setup_ca')
|
||||
options.setup_adtrust = ansible_module.params.get('setup_adtrust')
|
||||
### ad trust ###
|
||||
options.enable_compat = ansible_module.params.get('enable_compat')
|
||||
options.rid_base = ansible_module.params.get('rid_base')
|
||||
options.secondary_rid_base = ansible_module.params.get('secondary_rid_base')
|
||||
### additional ###
|
||||
adtrust.netbios_name = ansible_module.params.get('adtrust_netbios_name')
|
||||
adtrust.reset_netbios_name = \
|
||||
ansible_module.params.get('adtrust_reset_netbios_name')
|
||||
|
||||
# init ##########################################################
|
||||
|
||||
|
||||
Reference in New Issue
Block a user