https://fedorahosted.org/freeipa/ticket/6183
From 32ced2520263517432c9315780a39c4ad6b0c23d Mon Sep 17 00:00:00 2001 From: Stanislav Laznicka <slazn...@redhat.com> Date: Tue, 9 Aug 2016 16:03:03 +0200 Subject: [PATCH] Add --force-join option to ipa-replica-install There was a possibility that ipa-client-install script would suggest the --force-join option which does not exist in ipa-replica-install. https://fedorahosted.org/freeipa/ticket/6183 --- install/tools/man/ipa-replica-install.1 | 3 +++ ipaserver/install/server/replicainstall.py | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/install/tools/man/ipa-replica-install.1 b/install/tools/man/ipa-replica-install.1 index af37b07956691aeb676bb8e41e90f6ce783a5270..9be8fd17da5e992644967535a5dded32f5a6c0f7 100644 --- a/install/tools/man/ipa-replica-install.1 +++ b/install/tools/man/ipa-replica-install.1 @@ -110,6 +110,9 @@ Do not configure OpenSSH server. \fB\-\-skip\-conncheck\fR Skip connection check to remote master .TP +\fB\-\-force\-join\fR +Force client enrollment even if already enrolled +.TP \fB\-d\fR, \fB\-\-debug Enable debug logging when more verbose output is needed .TP diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index f54ff7da06c57b9c8251429cbdacc5c300805f84..6292eaec781af89e66ea35c1ef3dcfde439de803 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -892,6 +892,8 @@ def install(installer): args.append("--no-sshd") if options.mkhomedir: args.append("--mkhomedir") + if options.force_join: + args.append("--force-join") ipautil.run(args, redirect_output=True) print() except Exception: @@ -951,6 +953,8 @@ def ensure_enrolled(installer): args.append("--no-sshd") if installer.mkhomedir: args.append("--mkhomedir") + if installer.force_join: + args.append("--force-join") ipautil.run(args, stdin=stdin, redirect_output=True) print() @@ -1599,6 +1603,11 @@ class Replica(BaseServer): description="skip connection check to remote master", ) + force_join = Knob( + bool, False, + description="Force client enrollment even if already enrolled", + ) + principal = Knob( str, None, sensitive=True, -- 2.7.4
-- 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
