diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2015-01-27 07:38:06 +0000 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2015-01-27 16:44:02 +0100 |
| commit | deb70d5b13ce0e7ec77debb4aa17d75df4c1dedd (patch) | |
| tree | 487d2a672b63154943b7f213225fa2a8abc17161 /ipaserver | |
| parent | 55b7eed77e5f76c159ba157d020e93aa9d43bdc5 (diff) | |
| download | freeipa-deb70d5b13ce0e7ec77debb4aa17d75df4c1dedd.tar.gz freeipa-deb70d5b13ce0e7ec77debb4aa17d75df4c1dedd.tar.xz freeipa-deb70d5b13ce0e7ec77debb4aa17d75df4c1dedd.zip | |
Do not crash when replica is unreachable in ipa-restore
https://fedorahosted.org/freeipa/ticket/4857
Reviewed-By: Martin Kosek <mkosek@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/ipa_restore.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py index de926b1a2..eec97781a 100644 --- a/ipaserver/install/ipa_restore.py +++ b/ipaserver/install/ipa_restore.py @@ -457,6 +457,7 @@ class Restore(admintool.AdminTool): self.dirman_password) except Exception, e: self.log.critical("Unable to disable agreement on %s: %s" % (master, e)) + continue master_dn = DN(('cn', master), ('cn', 'masters'), ('cn', 'ipa'), ('cn', 'etc'), api.env.basedn) try: @@ -481,6 +482,7 @@ class Restore(admintool.AdminTool): self.dirman_password) except Exception, e: self.log.critical("Unable to disable agreement on %s: %s" % (master, e)) + continue host_entries = repl.find_ipa_replication_agreements() hosts = [rep.single_value.get('nsds5replicahost') |