|
 |
403b09 |
From a1b1518f02e0237fb8080851d0722f866b127918 Mon Sep 17 00:00:00 2001
|
|
|
403b09 |
From: Stanislav Laznicka <slaznick@redhat.com>
|
|
|
403b09 |
Date: Tue, 9 Aug 2016 15:22:33 +0200
|
|
|
403b09 |
Subject: [PATCH] Don't show --force-ntpd option in replica install
|
|
|
403b09 |
|
|
|
403b09 |
Always run the client installation script with --no-ntp
|
|
|
403b09 |
option so that it does not show the message about --force-ntpd
|
|
|
403b09 |
option that does not exist in ipa-replica-install. The time
|
|
|
403b09 |
synchronization is done elsewhere anyway.
|
|
|
403b09 |
|
|
|
403b09 |
https://fedorahosted.org/freeipa/ticket/6046
|
|
|
403b09 |
|
|
|
403b09 |
Reviewed-By: Martin Basti <mbasti@redhat.com>
|
|
|
403b09 |
---
|
|
|
403b09 |
ipaserver/install/server/replicainstall.py | 4 ++--
|
|
|
403b09 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
403b09 |
|
|
|
403b09 |
diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
|
|
|
403b09 |
index 9d05a0be5a2679d825b4ee6bc2ea55ed358e8ff9..f54ff7da06c57b9c8251429cbdacc5c300805f84 100644
|
|
|
403b09 |
--- a/ipaserver/install/server/replicainstall.py
|
|
|
403b09 |
+++ b/ipaserver/install/server/replicainstall.py
|
|
|
403b09 |
@@ -881,7 +881,7 @@ def install(installer):
|
|
|
403b09 |
try:
|
|
|
403b09 |
args = [paths.IPA_CLIENT_INSTALL, "--on-master", "--unattended",
|
|
|
403b09 |
"--domain", config.domain_name, "--server", config.host_name,
|
|
|
403b09 |
- "--realm", config.realm_name]
|
|
|
403b09 |
+ "--realm", config.realm_name, "--no-ntp"]
|
|
|
403b09 |
if options.no_dns_sshfp:
|
|
|
403b09 |
args.append("--no-dns-sshfp")
|
|
|
403b09 |
if options.ssh_trust_dns:
|
|
|
403b09 |
@@ -918,7 +918,7 @@ def ensure_enrolled(installer):
|
|
|
403b09 |
try:
|
|
|
403b09 |
installer._enrollment_performed = True
|
|
|
403b09 |
|
|
|
403b09 |
- args = [paths.IPA_CLIENT_INSTALL, "--unattended"]
|
|
|
403b09 |
+ args = [paths.IPA_CLIENT_INSTALL, "--unattended", "--no-ntp"]
|
|
|
403b09 |
stdin = None
|
|
|
403b09 |
|
|
|
403b09 |
if installer.domain_name:
|
|
|
403b09 |
--
|
|
|
403b09 |
2.7.4
|
|
|
403b09 |
|