|
 |
e3ffab |
From 394e24cee7dfb8f1d860b936f7a865e8cace8c71 Mon Sep 17 00:00:00 2001
|
|
|
e3ffab |
From: Jan Cholasta <jcholast@redhat.com>
|
|
|
e3ffab |
Date: Tue, 27 Jan 2015 07:38:06 +0000
|
|
|
e3ffab |
Subject: [PATCH] Do not crash when replica is unreachable in ipa-restore
|
|
|
e3ffab |
|
|
|
e3ffab |
https://fedorahosted.org/freeipa/ticket/4857
|
|
|
e3ffab |
|
|
|
e3ffab |
Reviewed-By: Martin Kosek <mkosek@redhat.com>
|
|
|
e3ffab |
---
|
|
|
e3ffab |
ipaserver/install/ipa_restore.py | 2 ++
|
|
|
e3ffab |
1 file changed, 2 insertions(+)
|
|
|
e3ffab |
|
|
|
e3ffab |
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
|
|
|
e3ffab |
index 6de73e640d101a72aacc7ce73a6937c222da4ebb..efe3b9b1c0c10775b3a72b9d843924263526209a 100644
|
|
|
e3ffab |
--- a/ipaserver/install/ipa_restore.py
|
|
|
e3ffab |
+++ b/ipaserver/install/ipa_restore.py
|
|
|
e3ffab |
@@ -458,6 +458,7 @@ class Restore(admintool.AdminTool):
|
|
|
e3ffab |
self.dirman_password)
|
|
|
e3ffab |
except Exception, e:
|
|
|
e3ffab |
self.log.critical("Unable to disable agreement on %s: %s" % (master, e))
|
|
|
e3ffab |
+ continue
|
|
|
e3ffab |
|
|
|
e3ffab |
master_dn = DN(('cn', master), ('cn', 'masters'), ('cn', 'ipa'), ('cn', 'etc'), api.env.basedn)
|
|
|
e3ffab |
try:
|
|
|
e3ffab |
@@ -482,6 +483,7 @@ class Restore(admintool.AdminTool):
|
|
|
e3ffab |
self.dirman_password)
|
|
|
e3ffab |
except Exception, e:
|
|
|
e3ffab |
self.log.critical("Unable to disable agreement on %s: %s" % (master, e))
|
|
|
e3ffab |
+ continue
|
|
|
e3ffab |
|
|
|
e3ffab |
host_entries = repl.find_ipa_replication_agreements()
|
|
|
e3ffab |
hosts = [rep.single_value.get('nsds5replicahost')
|
|
|
e3ffab |
--
|
|
|
e3ffab |
2.1.0
|
|
|
e3ffab |
|