https://fedorahosted.org/freeipa/ticket/4988
Patch attached. -- Martin Basti
From b38c190f2d87a39f7b83aafc3e8c45c228ea1b2a Mon Sep 17 00:00:00 2001 From: Martin Basti <mba...@redhat.com> Date: Thu, 16 Jul 2015 16:26:55 +0200 Subject: [PATCH] Allow value 'no' for replica-certify-all attr in abort-clean-ruv subcommand --force option set replica-certify-all to 'no' during abort-clean-ruv subcommand https://fedorahosted.org/freeipa/ticket/4988 --- install/tools/ipa-replica-manage | 2 +- ipaserver/install/replication.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index e525a02f4c60350b7a943abab4b4aedd957e984a..50a57f70ec452c0df5bf2ea55d2a136e8149aa41 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -470,7 +470,7 @@ def abort_clean_ruv(realm, ruv, options): print thisrepl = replication.ReplicationManager(realm, options.host, options.dirman_passwd) - thisrepl.abortcleanallruv(ruv) + thisrepl.abortcleanallruv(ruv, options.force) print "Cleanup task stopped" diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index 0f420106e093e8a7a277016857d27aaa48daa4dc..e9af88dc4356d4fd5495f4fea399ab09c75db953 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -1451,7 +1451,7 @@ class ReplicationManager(object): wait_for_task(self.conn, dn) - def abortcleanallruv(self, replicaId): + def abortcleanallruv(self, replicaId, force=False): """ Create a task to abort a CLEANALLRUV operation. """ @@ -1465,6 +1465,7 @@ class ReplicationManager(object): 'replica-id': [replicaId], 'objectclass': ['top', 'extensibleObject'], 'cn': ['abort %d' % replicaId], + 'replica-certify-all': ['no'] if force else ['yes'], } ) try: -- 2.4.3
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
