|
 |
979ee0 |
From 6db737931822c188833dee8cd086f91c640710fd Mon Sep 17 00:00:00 2001
|
|
|
979ee0 |
From: Felipe Barreto <fbarreto@redhat.com>
|
|
|
979ee0 |
Date: Mon, 15 Jan 2018 17:12:15 -0200
|
|
|
979ee0 |
Subject: [PATCH] Check if replication agreement exist before enable/disable it
|
|
|
979ee0 |
|
|
|
979ee0 |
If the replication agreement does not exist, a custom exception is
|
|
|
979ee0 |
raised explaining the problem.
|
|
|
979ee0 |
|
|
|
979ee0 |
https://pagure.io/freeipa/issue/7201
|
|
|
979ee0 |
|
|
|
979ee0 |
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
|
|
|
979ee0 |
Reviewed-By: Christian Heimes <cheimes@redhat.com>
|
|
|
979ee0 |
---
|
|
|
979ee0 |
install/tools/ipa-replica-manage | 7 +++++--
|
|
|
979ee0 |
ipaserver/install/replication.py | 11 +++++++++++
|
|
|
979ee0 |
2 files changed, 16 insertions(+), 2 deletions(-)
|
|
|
979ee0 |
|
|
|
979ee0 |
diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage
|
|
|
979ee0 |
index c00d8ca3a0fa8228c5aa782a270991f14ee16974..019826f822b23e4e55dedb794ff6c1459a3d93c8 100755
|
|
|
979ee0 |
--- a/install/tools/ipa-replica-manage
|
|
|
979ee0 |
+++ b/install/tools/ipa-replica-manage
|
|
|
979ee0 |
@@ -1200,8 +1200,11 @@ def re_initialize(realm, thishost, fromhost, dirman_passwd, nolookup=False):
|
|
|
979ee0 |
repl = replication.ReplicationManager(realm, fromhost, dirman_passwd)
|
|
|
979ee0 |
agreement = repl.get_replication_agreement(thishost)
|
|
|
979ee0 |
|
|
|
979ee0 |
- thisrepl.enable_agreement(fromhost)
|
|
|
979ee0 |
- repl.enable_agreement(thishost)
|
|
|
979ee0 |
+ try:
|
|
|
979ee0 |
+ thisrepl.enable_agreement(fromhost)
|
|
|
979ee0 |
+ repl.enable_agreement(thishost)
|
|
|
979ee0 |
+ except errors.NotFound as e:
|
|
|
979ee0 |
+ sys.exit(e)
|
|
|
979ee0 |
|
|
|
979ee0 |
repl.force_sync(repl.conn, thishost)
|
|
|
979ee0 |
|
|
|
979ee0 |
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
|
|
|
979ee0 |
index 3a76b70038bf6f739fe63aeac0233ccbfda2f016..d4b41caa45409fa1537ae10f182599307f3e0439 100644
|
|
|
979ee0 |
--- a/ipaserver/install/replication.py
|
|
|
979ee0 |
+++ b/ipaserver/install/replication.py
|
|
|
979ee0 |
@@ -31,6 +31,7 @@ import ldap
|
|
|
979ee0 |
from ipalib import api, errors
|
|
|
979ee0 |
from ipalib.cli import textui
|
|
|
979ee0 |
from ipapython.ipa_log_manager import root_logger
|
|
|
979ee0 |
+from ipalib.text import _
|
|
|
979ee0 |
from ipapython import ipautil, ipaldap, kerberos
|
|
|
979ee0 |
from ipapython.admintool import ScriptError
|
|
|
979ee0 |
from ipapython.dn import DN
|
|
|
979ee0 |
@@ -1599,6 +1600,11 @@ class ReplicationManager(object):
|
|
|
979ee0 |
Disable the replication agreement to hostname.
|
|
|
979ee0 |
"""
|
|
|
979ee0 |
entry = self.get_replication_agreement(hostname)
|
|
|
979ee0 |
+ if not entry:
|
|
|
979ee0 |
+ raise errors.NotFound(reason=_(
|
|
|
979ee0 |
+ "Replication agreement for %(hostname)s not found") % {
|
|
|
979ee0 |
+ 'hostname': hostname
|
|
|
979ee0 |
+ })
|
|
|
979ee0 |
entry['nsds5ReplicaEnabled'] = 'off'
|
|
|
979ee0 |
|
|
|
979ee0 |
try:
|
|
|
979ee0 |
@@ -1613,6 +1619,11 @@ class ReplicationManager(object):
|
|
|
979ee0 |
Note: for replication to work it needs to be enabled both ways.
|
|
|
979ee0 |
"""
|
|
|
979ee0 |
entry = self.get_replication_agreement(hostname)
|
|
|
979ee0 |
+ if not entry:
|
|
|
979ee0 |
+ raise errors.NotFound(reason=_(
|
|
|
979ee0 |
+ "Replication agreement for %(hostname)s not found") % {
|
|
|
979ee0 |
+ 'hostname': hostname
|
|
|
979ee0 |
+ })
|
|
|
979ee0 |
entry['nsds5ReplicaEnabled'] = 'on'
|
|
|
979ee0 |
|
|
|
979ee0 |
try:
|
|
|
979ee0 |
--
|
|
|
979ee0 |
2.17.1
|
|
|
979ee0 |
|