DNS Locations: dnsserver: put server_id option into named.conf

The option server_id is required for DNS location feature, otherwise it
will not work.

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

Reviewed-By: Petr Spacek <pspacek@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>

install/share/bind.named.conf.template

@@ -51,6 +51,7 @@ dynamic-db "ipa" {
 	arg "uri ldapi://%2fvar%2frun%2fslapd-$SERVER_ID.socket";
 	arg "base cn=dns, $SUFFIX";
 	arg "fake_mname $FQDN.";
+	arg "server_id $FQDN";
 	arg "auth_method sasl";
 	arg "sasl_mech GSSAPI";
 	arg "sasl_user DNS/$FQDN";

install/updates/40-dns.update

@@ -33,9 +33,3 @@ default: nsslapd-plugintype: preoperation
 default: nsslapd-pluginvendor: Red Hat, Inc.
 default: nsslapd-pluginversion: 1.0
 default: nsslapd-plugin-depends-on-type: database
-
-# add dns servers container
-dn: cn=servers,cn=dns,$SUFFIX
-default: objectClass: nsContainer
-default: objectClass: top
-default: cn: servers

install/updates/90-post_upgrade_plugins.update

@@ -26,3 +26,4 @@ plugin: update_managed_permissions
 plugin: update_read_replication_agreements_permission
 plugin: update_idrange_baserid
 plugin: update_passync_privilege_update
+plugin: update_dnsserver_configuration_into_ldap