diff options
author | Martin Babinsky <mbabinsk@redhat.com> | 2016-12-06 12:13:34 +0100 |
---|---|---|
committer | Martin Basti <mbasti@redhat.com> | 2016-12-07 12:30:38 +0100 |
commit | f0e09c42b76f229486e5dea097cd2b6602999943 (patch) | |
tree | 081b5dc1cd1310502d72629625cd755cf221964c | |
parent | 6d6fbc010ec2b607a11e0ff69c8cbdcd3c1d47d9 (diff) | |
download | freeipa-f0e09c42b76f229486e5dea097cd2b6602999943.tar.gz freeipa-f0e09c42b76f229486e5dea097cd2b6602999943.tar.xz freeipa-f0e09c42b76f229486e5dea097cd2b6602999943.zip |
bindinstance: use data in named.conf to determine configuration status
Instead of checking sysrestore status which leads to incorrect
evaluation of DNS configuration status during 4.2 -> 4.4 upgrade, look
into named.conf to see whther it was already modified by IPA installer.
https://fedorahosted.org/freeipa/ticket/6503
Reviewed-By: Martin Basti <mbasti@redhat.com>
-rw-r--r-- | ipaserver/install/bindinstance.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 89a280ae5..e24249aca 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -1144,6 +1144,13 @@ class BindInstance(service.Service): self.api.Command.dnsconfig_show.output_for_cli(textui, result, None, reverse=False) + def is_configured(self): + """ + Override the default logic querying StateFile for configuration status + and look whether named.conf was already modified by IPA installer. + """ + return named_conf_exists() + def uninstall(self): if self.is_configured(): self.print_msg("Unconfiguring %s" % self.service_name) |