diff options
| author | Martin Babinsky <mbabinsk@redhat.com> | 2016-07-14 17:14:59 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2016-07-15 14:13:32 +0200 |
| commit | 37bfd1fdde8906b2b5712d1f99f3f4be8f91ca0a (patch) | |
| tree | 59abe9891ec7d6176b1a34386fc1a19467eb4473 /ipaserver/install/plugins | |
| parent | 49389ed1e06c786df489c0fd9f6e8183f00eedff (diff) | |
| download | freeipa-37bfd1fdde8906b2b5712d1f99f3f4be8f91ca0a.tar.gz freeipa-37bfd1fdde8906b2b5712d1f99f3f4be8f91ca0a.tar.xz freeipa-37bfd1fdde8906b2b5712d1f99f3f4be8f91ca0a.zip | |
DNS install: Ensure that DNS servers container exists
during DNS installation it is assumed that the cn=servers,cn=dns container is
always present in LDAP backend when migrating DNS server info to LDAP.
This may not always be the case (e.g. when a new replica is set up against
older master) so the code must take additional steps to ensure this container
is present.
https://fedorahosted.org/freeipa/ticket/6083
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipaserver/install/plugins')
| -rw-r--r-- | ipaserver/install/plugins/dns.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/ipaserver/install/plugins/dns.py b/ipaserver/install/plugins/dns.py index 4fa30661e..32247eedb 100644 --- a/ipaserver/install/plugins/dns.py +++ b/ipaserver/install/plugins/dns.py @@ -29,6 +29,7 @@ from ipapython.dn import DN from ipapython import dnsutil from ipapython.ipa_log_manager import root_logger from ipaserver.install import sysupgrade +from ipaserver.install.bindinstance import ensure_dnsserver_container_exists from ipaserver.plugins.dns import dns_container_exists register = Registry() @@ -521,17 +522,7 @@ class update_dnsserver_configuration_into_ldap(DNSUpdater): return False, [] # create container first, if doesn't exist - entry = ldap.make_entry( - DN(self.api.env.container_dnsservers, self.api.env.basedn), - { - u'objectclass': [u'top', u'nsContainer'], - u'cn': [u'servers'] - } - ) - try: - ldap.add_entry(entry) - except errors.DuplicateEntry: - self.log.debug('cn=dnsservers container already exists') + ensure_dnsserver_container_exists(ldap, self.api, logger=self.log) try: self.api.Command.dnsserver_add(self.api.env.host) |