IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-28 09:06:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

DNS Locations: use automatic records update in ipa-adtrust-install

Browse Source 
DNS records for adtrust is added by call dns_update_system_records

https://fedorahosted.org/freeipa/ticket/2008

Reviewed-By: Petr Spacek <pspacek@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Martin Basti 2016-06-13 12:28:58 +02:00
parent a5a6ceafcd
commit a7e463948d
1 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ipaserver/install/adtrustinstance.py
View File

@ -30,10 +30,10 @@ import re
import six import six
from ipaserver.dns_data_management import IPASystemRecords
from ipaserver.install import service from ipaserver.install import service
from ipaserver.install import installutils from ipaserver.install import installutils
from ipaserver.install.bindinstance import get_rr, add_rr, del_rr, \ from ipaserver.install.bindinstance import dns_zone_exists
dns_zone_exists
from ipaserver.install.replication import wait_for_task from ipaserver.install.replication import wait_for_task
from ipalib import errors, api from ipalib import errors, api
from ipalib.util import normalize_zone from ipalib.util import normalize_zone
@ -580,17 +580,6 @@ class ADTRUSTInstance(service.Service):
""" """
zone = api.env.domain zone = api.env.domain
host_in_rr = normalize_zone(self.fqdn)
priority = 0
ipa_srv_rec = (
("_ldap._tcp", [self.srv_rec(host_in_rr, 389, priority)], 389),
("_kerberos._tcp", [self.srv_rec(host_in_rr, 88, priority)], 88),
("_kerberos._udp", [self.srv_rec(host_in_rr, 88, priority)], 88),
)
win_srv_suffix = (".Default-First-Site-Name._sites.dc._msdcs",
".dc._msdcs")
err_msg = None err_msg = None
@ -610,27 +599,15 @@ class ADTRUSTInstance(service.Service):
self.print_msg(err_msg) self.print_msg(err_msg)
self.print_msg("Add the following service records to your DNS " \ self.print_msg("Add the following service records to your DNS " \
"server for DNS zone %s: " % zone) "server for DNS zone %s: " % zone)
for suff in win_srv_suffix: system_records = IPASystemRecords(api)
for srv in ipa_srv_rec: adtrust_recors = system_records.get_base_records(
self.print_msg("%s%s IN SRV %s" % (srv[0], suff, " ".join(srv[1]))) [self.fqdn], ["AD trust controller"],
self.print_msg("") include_master_role=False, include_kerberos_realm=False)
return for r_name, node in adtrust_recors.items():
for rec in IPASystemRecords.records_list_from_node(r_name, node):
for (srv, rdata, port) in ipa_srv_rec: self.print_msg(rec)
cifs_rdata = list() else:
for fqdn in self.cifs_hosts: api.Command.dns_update_system_records()
cifs_srv = self.srv_rec(fqdn, port, priority)
cifs_rdata.append(cifs_srv)
cifs_rdata.extend(rdata)
for suff in win_srv_suffix:
win_srv = srv+suff
win_rdata = get_rr(zone, win_srv, "SRV")
if win_rdata:
for rec in win_rdata:
del_rr(zone, win_srv, "SRV", rec)
for rec in cifs_rdata:
add_rr(zone, win_srv, "SRV", rec)
def __configure_selinux_for_smbd(self): def __configure_selinux_for_smbd(self):
try: try: