diff options
| author | Martin Basti <mbasti@redhat.com> | 2015-07-16 16:26:55 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2015-07-17 16:47:18 +0200 |
| commit | 82aaa1e6d07a13429381b94ffe4b5fc562427213 (patch) | |
| tree | 4829e5db5b0169c1e6227ac34eded770d2f56439 | |
| parent | 75fde43491872d3e2f52e8a523af9e60486fd0e0 (diff) | |
| download | freeipa-82aaa1e6d07a13429381b94ffe4b5fc562427213.tar.gz freeipa-82aaa1e6d07a13429381b94ffe4b5fc562427213.tar.xz freeipa-82aaa1e6d07a13429381b94ffe4b5fc562427213.zip | |
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
Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
| -rwxr-xr-x | install/tools/ipa-replica-manage | 2 | ||||
| -rw-r--r-- | install/tools/man/ipa-replica-manage.1 | 2 | ||||
| -rw-r--r-- | ipaserver/install/replication.py | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index e525a02f4..50a57f70e 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/install/tools/man/ipa-replica-manage.1 b/install/tools/man/ipa-replica-manage.1 index 8a7c78f39..c09ed362f 100644 --- a/install/tools/man/ipa-replica-manage.1 +++ b/install/tools/man/ipa-replica-manage.1 @@ -49,7 +49,7 @@ Manages the replication agreements of an IPA server. The available commands are: \- Run the CLEANALLRUV task to remove a replication ID. .TP \fBabort\-clean\-ruv\fR [REPLICATION_ID] -\- Abort a running CLEANALLRUV task. +\- Abort a running CLEANALLRUV task. With \-\-force option the task does not wait for all the replica servers to have been sent the abort task, or be online, before completing. .TP \fBlist\-clean\-ruv\fR \- List all running CLEANALLRUV and abort CLEANALLRUV tasks. diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index 0f420106e..e9af88dc4 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: |