From 411e6c37fbcb6ddc4c60b240ecaaa418401ac359 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 23 Apr 2019 15:57:28 +0200 Subject: [PATCH] Deprecate ipa-client-install --request-cert Mark the --request-cert option for ipa-client-install as deprecated. Users are encouraged to request a PEM certificate with certmonger instead. The option and /etc/ipa/nssdb will be removed in a future version. Related: https://pagure.io/freeipa/issue/7492 Signed-off-by: Christian Heimes Reviewed-By: Rob Crittenden --- client/man/ipa-client-install.1 | 7 +++++++ ipaclient/install/client.py | 12 +++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/client/man/ipa-client-install.1 b/client/man/ipa-client-install.1 index a20bec9a1..94b4b04c8 100644 --- a/client/man/ipa-client-install.1 +++ b/client/man/ipa-client-install.1 @@ -168,6 +168,8 @@ authoritative and will be installed without checking to see if it's valid for the IPA domain. .TP \fB\-\-request\-cert\fR +\fBDEPRECATED:\fR The option is deprecated and will be removed in a future release. + Request certificate for the machine. The certificate will be stored in /etc/ipa/nssdb under the nickname "Local IPA host". Using this option requires that D-Bus is properly configured or not configured @@ -269,6 +271,11 @@ Files updated, existing content is maintained: /etc/krb5.keytab .br /etc/sysconfig/network + +.SH "DEPRECATED OPTIONS" +.TP +\fB\-\-request\-cert\fR + .SH "EXIT STATUS" 0 if the installation was successful diff --git a/ipaclient/install/client.py b/ipaclient/install/client.py index 0488108a7..e67a49bda 100644 --- a/ipaclient/install/client.py +++ b/ipaclient/install/client.py @@ -3691,6 +3691,7 @@ class ClientInstallInterface(hostname_.HostNameInstallInterface, request_cert = knob( None, + deprecated=True, description="request certificate for the machine", ) request_cert = prepare_only(request_cert) @@ -3703,7 +3704,10 @@ class ClientInstallInterface(hostname_.HostNameInstallInterface, "--server cannot be used without providing --domain") if self.force_ntpd: - logger.warning("Option --force-ntpd has been deprecated") + logger.warning( + "Option --force-ntpd has been deprecated and will be " + "removed in a future release." + ) if self.ntp_servers and self.no_ntp: raise RuntimeError( @@ -3713,6 +3717,12 @@ class ClientInstallInterface(hostname_.HostNameInstallInterface, raise RuntimeError( "--ntp-pool cannot be used together with --no-ntp") + if self.request_cert: + logger.warning( + "Option --request-cert has been deprecated and will be " + "removed in a future release." + ) + if self.no_nisdomain and self.nisdomain: raise RuntimeError( "--no-nisdomain cannot be used together with --nisdomain")