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

ipareplica: Initialize dns.ip_addresses and dns.reverse_zones for dns setup

Browse Source 
These two varibles in the dns binding are initialized in the installation
check in the install_check parts of ipareplica_prepare and used later on
in the dns configuration in ipareplica_setup_dns.
This commit is contained in:
Thomas Woerner
2019-07-17 19:17:31 +02:00
parent a3578de4b2
commit 6378d9b1dc
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/ipareplica/library/ipareplica_prepare.py
View File

@@ -750,10 +750,14 @@ def main():
config_kra_host_name=config.kra_host_name, config_kra_host_name=config.kra_host_name,
config_ips=[ str(ip) for ip in config.ips ], config_ips=[ str(ip) for ip in config.ips ],
### ad trust ### ### ad trust ###
dns_ip_addresses=[ str(ip) for ip
in dns.ip_addresses ],
dns_reverse_zones=dns.reverse_zones,
rid_base=options.rid_base, rid_base=options.rid_base,
secondary_rid_base=options.secondary_rid_base, secondary_rid_base=options.secondary_rid_base,
adtrust_netbios_name=adtrust.netbios_name, adtrust_netbios_name=adtrust.netbios_name,
adtrust_reset_netbios_name=adtrust.reset_netbios_name) adtrust_reset_netbios_name=adtrust.reset_netbios_name)
if __name__ == '__main__': if __name__ == '__main__':
main() main()

5
roles/ipareplica/library/ipareplica_setup_dns.py
View File

@@ -93,6 +93,8 @@ def main():
no_dnssec_validation=dict(required=False, type='bool', no_dnssec_validation=dict(required=False, type='bool',
default=False), default=False),
### additional ### ### additional ###
dns_ip_addresses=dict(required=True, type='list'),
dns_reverse_zones=dict(required=True, type='list'),
ccache=dict(required=True), ccache=dict(required=True),
_top_dir = dict(required=True), _top_dir = dict(required=True),
setup_ca=dict(required=True, type='bool'), setup_ca=dict(required=True, type='bool'),
@@ -121,6 +123,9 @@ def main():
options.no_dnssec_validation = ansible_module.params.get( options.no_dnssec_validation = ansible_module.params.get(
'no_dnssec_validationdnssec_validation') 'no_dnssec_validationdnssec_validation')
### additional ### ### additional ###
dns.ip_addresses = ansible_module_get_parsed_ip_addresses(
ansible_module, 'dns_ip_addresses')
dns.reverse_zones = ansible_module.params.get('dns_reverse_zones')
ccache = ansible_module.params.get('ccache') ccache = ansible_module.params.get('ccache')
os.environ['KRB5CCNAME'] = ccache os.environ['KRB5CCNAME'] = ccache
options._top_dir = ansible_module.params.get('_top_dir') options._top_dir = ansible_module.params.get('_top_dir')

2
roles/ipareplica/tasks/install.yml
View File

@@ -682,6 +682,8 @@
not none else omit }}" not none else omit }}"
no_dnssec_validation: "{{ ipareplica_no_dnssec_validation }}" no_dnssec_validation: "{{ ipareplica_no_dnssec_validation }}"
### additional ### ### additional ###
dns_ip_addresses: "{{ result_ipareplica_prepare.dns_ip_addresses }}"
dns_reverse_zones: "{{ result_ipareplica_prepare.dns_reverse_zones }}"
ccache: "{{ result_ipareplica_prepare.ccache }}" ccache: "{{ result_ipareplica_prepare.ccache }}"
_top_dir: "{{ result_ipareplica_prepare._top_dir }}" _top_dir: "{{ result_ipareplica_prepare._top_dir }}"
setup_ca: "{{ result_ipareplica_prepare.config_setup_ca }}" setup_ca: "{{ result_ipareplica_prepare.config_setup_ca }}"