[Freeipa-devel] [freeipa PR#857][synchronized] baseldap.py: Removes dns-server configuration from ldap

2017-06-08 Thread Tiboris via FreeIPA-devel 
   URL: https://github.com/freeipa/freeipa/pull/857
Author: Tiboris
 Title: #857: baseldap.py: Removes dns-server configuration from ldap
Action: synchronized

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/857/head:pr857
git checkout pr857
From f68865a0af8378157758d3b5e1a4c35454692faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Dudl=C3=A1k?= 
Date: Tue, 6 Jun 2017 15:13:26 +0200
Subject: [PATCH] server.py: Removes dns-server configuration from ldap

After invocation of the ipa server-del 
command there was still record in ldap if DNS
was installed on the  server.

Fixes: https://pagure.io/freeipa/issue/6572
---
 ipaserver/plugins/server.py | 9 +
 1 file changed, 9 insertions(+)

diff --git a/ipaserver/plugins/server.py b/ipaserver/plugins/server.py
index 7aea619b34..81abc66e70 100644
--- a/ipaserver/plugins/server.py
+++ b/ipaserver/plugins/server.py
@@ -692,6 +692,12 @@ def _cleanup_server_dns_records(self, hostname, **options):
 message=_("You may need to manually remove them from the "
   "tree")))
 
+def _cleanup_server_dns_config(self, hostname):
+try:
+self.api.Command.dnsserver_del(hostname)
+except errors.NotFound:
+pass
+
 def pre_callback(self, ldap, dn, *keys, **options):
 pkey = self.obj.get_primary_key_from_dn(dn)
 
@@ -731,6 +737,9 @@ def pre_callback(self, ldap, dn, *keys, **options):
 # try to clean up the leftover DNS entries
 self._cleanup_server_dns_records(pkey)
 
+# try to clean up the DNS config from ldap
+self._cleanup_server_dns_config(pkey)
+
 return dn
 
 def exc_callback(self, keys, options, exc, call_func, *call_args,
___
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org

[Freeipa-devel] [freeipa PR#857][synchronized] baseldap.py: Removes dns-server configuration from ldap

2017-06-07 Thread Tiboris via FreeIPA-devel 
   URL: https://github.com/freeipa/freeipa/pull/857
Author: Tiboris
 Title: #857: baseldap.py: Removes dns-server configuration from ldap
Action: synchronized

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/857/head:pr857
git checkout pr857
From 97e925fef2b7a82f021cc594fb01f98e428aec05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Dudl=C3=A1k?= 
Date: Tue, 6 Jun 2017 15:13:26 +0200
Subject: [PATCH] baseldap.py: Removes dns-server configuration from ldap

After invocation of the ipa server-del 
command there was still record in ldap if DNS
was installed on the  server.

Fixes: https://pagure.io/freeipa/issue/6572
---
 ipaserver/plugins/server.py | 9 +
 1 file changed, 9 insertions(+)

diff --git a/ipaserver/plugins/server.py b/ipaserver/plugins/server.py
index 7aea619b34..81abc66e70 100644
--- a/ipaserver/plugins/server.py
+++ b/ipaserver/plugins/server.py
@@ -692,6 +692,12 @@ def _cleanup_server_dns_records(self, hostname, **options):
 message=_("You may need to manually remove them from the "
   "tree")))
 
+def _cleanup_server_dns_config(self, hostname):
+try:
+self.api.Command.dnsserver_del(hostname)
+except errors.NotFound:
+pass
+
 def pre_callback(self, ldap, dn, *keys, **options):
 pkey = self.obj.get_primary_key_from_dn(dn)
 
@@ -731,6 +737,9 @@ def pre_callback(self, ldap, dn, *keys, **options):
 # try to clean up the leftover DNS entries
 self._cleanup_server_dns_records(pkey)
 
+# try to clean up the DNS config from ldap
+self._cleanup_server_dns_config(pkey)
+
 return dn
 
 def exc_callback(self, keys, options, exc, call_func, *call_args,
___
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org

[Freeipa-devel] [freeipa PR#857][synchronized] baseldap.py: Removes dns-server configuration from ldap

2017-06-07 Thread Tiboris via FreeIPA-devel 
   URL: https://github.com/freeipa/freeipa/pull/857
Author: Tiboris
 Title: #857: baseldap.py: Removes dns-server configuration from ldap
Action: synchronized

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/857/head:pr857
git checkout pr857
From 43ba99d72d73f6af6ace796564ad697f1ef5a4b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Dudl=C3=A1k?= 
Date: Tue, 6 Jun 2017 15:13:26 +0200
Subject: [PATCH] baseldap.py: Removes dns-server configuration from ldap

After invocation of the ipa server-del 
command there was still record in ldap if DNS
was installed on the  server.

Fixes: https://pagure.io/freeipa/issue/6572
---
 ipaserver/plugins/server.py | 9 +
 1 file changed, 9 insertions(+)

diff --git a/ipaserver/plugins/server.py b/ipaserver/plugins/server.py
index 7aea619b34..7411ee7df2 100644
--- a/ipaserver/plugins/server.py
+++ b/ipaserver/plugins/server.py
@@ -692,6 +692,12 @@ def _cleanup_server_dns_records(self, hostname, **options):
 message=_("You may need to manually remove them from the "
   "tree")))
 
+def _cleanup_server_dns_config(self, hostname):
+try:
+self.api.Command.dnsserver_del(hostname)
+except errors.NotFound:
+pass
+
 def pre_callback(self, ldap, dn, *keys, **options):
 pkey = self.obj.get_primary_key_from_dn(dn)
 
@@ -731,6 +737,9 @@ def pre_callback(self, ldap, dn, *keys, **options):
 # try to clean up the leftover DNS entries
 self._cleanup_server_dns_records(pkey)
 
+# try to clean up the DNS config from ldap
+self._cleanup_server_dns_config(ldap, pkey)
+
 return dn
 
 def exc_callback(self, keys, options, exc, call_func, *call_args,
___
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org

[Freeipa-devel] [freeipa PR#857][synchronized] baseldap.py: Removes dns-server configuration from ldap

2017-06-07 Thread Tiboris via FreeIPA-devel 
   URL: https://github.com/freeipa/freeipa/pull/857
Author: Tiboris
 Title: #857: baseldap.py: Removes dns-server configuration from ldap
Action: synchronized

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/857/head:pr857
git checkout pr857
From db19101c3fe6ea537c79b9db95bdc965b590aa3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Dudl=C3=A1k?= 
Date: Tue, 6 Jun 2017 15:13:26 +0200
Subject: [PATCH] baseldap.py: Removes dns-server configuration from ldap

After invocation of the ipa server-del 
command there was still record in ldap if DNS
was installed on the  server.

Fixes: https://pagure.io/freeipa/issue/6572
---
 ipaserver/plugins/server.py | 12 
 1 file changed, 12 insertions(+)

diff --git a/ipaserver/plugins/server.py b/ipaserver/plugins/server.py
index 7aea619b34..b9af4e43e6 100644
--- a/ipaserver/plugins/server.py
+++ b/ipaserver/plugins/server.py
@@ -692,6 +692,15 @@ def _cleanup_server_dns_records(self, hostname, **options):
 message=_("You may need to manually remove them from the "
   "tree")))
 
+def _cleanup_server_dns_config(self, ldap, hostname):
+dn = self.api.Object.dnsserver.get_dn(hostname)
+assert isinstance(dn, DN)
+
+try:
+ldap.delete_entry(dn)
+except errors.NotFound:
+pass
+
 def pre_callback(self, ldap, dn, *keys, **options):
 pkey = self.obj.get_primary_key_from_dn(dn)
 
@@ -731,6 +740,9 @@ def pre_callback(self, ldap, dn, *keys, **options):
 # try to clean up the leftover DNS entries
 self._cleanup_server_dns_records(pkey)
 
+# try to clean up the DNS config from ldap
+self._cleanup_server_dns_config(ldap, pkey)
+
 return dn
 
 def exc_callback(self, keys, options, exc, call_func, *call_args,
___
FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org
To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org