Allow host re-enrollment using delegation

A new option --force-join has been added to ipa-client-install.
It forces the host enrollment even if the host entry exists.
Old certificate is revoked, new certificate and ssh key pair
generated. See the relevant design for the re-enrollment part:
http://freeipa.org/page/V3/Forced_client_re-enrollment

https://fedorahosted.org/freeipa/ticket/3482
This commit is contained in:
Tomas Babej
2013-03-25 10:53:25 +01:00
committed by Martin Kosek
parent 322458b5b2
commit a7ccc198a7
2 changed files with 9 additions and 1 deletions
@@ -111,6 +111,9 @@ def parse_options():
help="The hostname of this machine (FQDN). If specified, the hostname will be set and " help="The hostname of this machine (FQDN). If specified, the hostname will be set and "
"the system configuration will be updated to persist over reboot. " "the system configuration will be updated to persist over reboot. "
"By default a nodename result from uname(2) is used.") "By default a nodename result from uname(2) is used.")
basic_group.add_option("", "--force-join", dest="force_join",
action="store_true", default=False,
help="Force client enrollment even if already enrolled")
basic_group.add_option("--ntp-server", dest="ntp_server", help="ntp server to use") basic_group.add_option("--ntp-server", dest="ntp_server", help="ntp server to use")
basic_group.add_option("-N", "--no-ntp", action="store_false", basic_group.add_option("-N", "--no-ntp", action="store_false",
help="do not configure ntp", default=True, dest="conf_ntp") help="do not configure ntp", default=True, dest="conf_ntp")
@@ -1989,6 +1992,8 @@ def install(options, env, fstore, statestore):
if options.hostname: if options.hostname:
join_args.append("-h") join_args.append("-h")
join_args.append(options.hostname) join_args.append(options.hostname)
if options.force_join:
join_args.append("-f")
if options.principal is not None: if options.principal is not None:
stdin = None stdin = None
principal = options.principal principal = options.principal
+4 -1
View File
@@ -77,7 +77,7 @@ Password for joining a machine to the IPA realm. Assumes bulk password unless pr
Prompt for the password for joining a machine to the IPA realm. Prompt for the password for joining a machine to the IPA realm.
.TP .TP
\fB\-k\fR, \fB\-\-keytab\fR \fB\-k\fR, \fB\-\-keytab\fR
Path to backed up host keytab from previous enrollment. Path to backed up host keytab from previous enrollment. Joins the host even if it is already enrolled.
.TP .TP
\fB\-\-mkhomedir\fR \fB\-\-mkhomedir\fR
Configure PAM to create a users home directory if it does not exist. Configure PAM to create a users home directory if it does not exist.
@@ -85,6 +85,9 @@ Configure PAM to create a users home directory if it does not exist.
\fB\-\-hostname\fR \fB\-\-hostname\fR
The hostname of this machine (FQDN). If specified, the hostname will be set and the system configuration will be updated to persist over reboot. By default a nodename result from uname(2) is used. The hostname of this machine (FQDN). If specified, the hostname will be set and the system configuration will be updated to persist over reboot. By default a nodename result from uname(2) is used.
.TP .TP
\fB\-\-force\-join\fR
Join the host even if it is already enrolled.
.TP
\fB\-\-ntp\-server\fR=\fINTP_SERVER\fR \fB\-\-ntp\-server\fR=\fINTP_SERVER\fR
Configure ntpd to use this NTP server. Configure ntpd to use this NTP server.
.TP .TP