|
 |
34b659 |
From b84a175ad6a8c2b25d6db388fa88e6441d97ae94 Mon Sep 17 00:00:00 2001
|
|
|
34b659 |
From: Martin Babinsky <mbabinsk@redhat.com>
|
|
|
34b659 |
Date: Tue, 6 Dec 2016 12:13:34 +0100
|
|
|
34b659 |
Subject: [PATCH] bindinstance: use data in named.conf to determine
|
|
|
34b659 |
configuration status
|
|
|
34b659 |
|
|
|
34b659 |
Instead of checking sysrestore status which leads to incorrect
|
|
|
34b659 |
evaluation of DNS configuration status during 4.2 -> 4.4 upgrade, look
|
|
|
34b659 |
into named.conf to see whther it was already modified by IPA installer.
|
|
|
34b659 |
|
|
|
34b659 |
https://fedorahosted.org/freeipa/ticket/6503
|
|
|
34b659 |
|
|
|
34b659 |
Reviewed-By: Martin Basti <mbasti@redhat.com>
|
|
|
34b659 |
---
|
|
|
34b659 |
ipaserver/install/bindinstance.py | 7 +++++++
|
|
|
34b659 |
1 file changed, 7 insertions(+)
|
|
|
34b659 |
|
|
|
34b659 |
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
|
|
|
34b659 |
index 7538e145cbe37dfc21963d97dea0e835e3bd5072..a65b065fd654655ff034e277eb7e0ad49e4a418e 100644
|
|
|
34b659 |
--- a/ipaserver/install/bindinstance.py
|
|
|
34b659 |
+++ b/ipaserver/install/bindinstance.py
|
|
|
34b659 |
@@ -1170,6 +1170,13 @@ class BindInstance(service.Service):
|
|
|
34b659 |
self.api.Command.dnsconfig_show.output_for_cli(textui, result, None,
|
|
|
34b659 |
reverse=False)
|
|
|
34b659 |
|
|
|
34b659 |
+ def is_configured(self):
|
|
|
34b659 |
+ """
|
|
|
34b659 |
+ Override the default logic querying StateFile for configuration status
|
|
|
34b659 |
+ and look whether named.conf was already modified by IPA installer.
|
|
|
34b659 |
+ """
|
|
|
34b659 |
+ return named_conf_exists()
|
|
|
34b659 |
+
|
|
|
34b659 |
def uninstall(self):
|
|
|
34b659 |
if self.is_configured():
|
|
|
34b659 |
self.print_msg("Unconfiguring %s" % self.service_name)
|
|
|
34b659 |
--
|
|
|
34b659 |
2.7.4
|
|
|
34b659 |
|