mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
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>
This commit is contained in:
committed by
Petr Vobornik
parent
75fde43491
commit
82aaa1e6d0
@@ -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"
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user