diff options
| author | Martin Basti <mbasti@redhat.com> | 2016-06-16 21:53:31 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-06-17 18:05:03 +0200 |
| commit | 88ac58a1ce0641e65bcc7934020f85ef39d8e82b (patch) | |
| tree | 598d508b85de3b57afc1a0cfd424729bf0303aa6 /ipaserver/install/bindinstance.py | |
| parent | 313e63e3e4ba1aa3dd2ae5de54f6d277329fffee (diff) | |
| download | freeipa-88ac58a1ce0641e65bcc7934020f85ef39d8e82b.tar.gz freeipa-88ac58a1ce0641e65bcc7934020f85ef39d8e82b.tar.xz freeipa-88ac58a1ce0641e65bcc7934020f85ef39d8e82b.zip | |
upgrade: don't fail if zone does not exists in in find
In case that zone is not managed by IPA, upgrade fails with not found
error. Prevent failure in this case.
Reviewed-By: Petr Spacek <pspacek@redhat.com>
Diffstat (limited to 'ipaserver/install/bindinstance.py')
| -rw-r--r-- | ipaserver/install/bindinstance.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index a335ff5f4..188f3dc0e 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -1037,7 +1037,11 @@ class BindInstance(service.Service): def remove_ipa_ca_cnames(self, domain_name): # get ipa-ca CNAMEs - cnames = get_rr(domain_name, IPA_CA_RECORD, "CNAME", api=self.api) + try: + cnames = get_rr(domain_name, IPA_CA_RECORD, "CNAME", api=self.api) + except errors.NotFound: + # zone does not exists + cnames = None if not cnames: return |