From 3d3197b11a6e7c6222f78648977b2ab30d848f1a Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 23 Sep 2010 11:41:24 -0400 Subject: Don't do autodiscovery on master install. If we pass in the domain and server to ipa-client-install it doesn't do service discovery which is what we want. We want to be sure the server is properly configured at install time. --- ipa-client/ipa-install/ipa-client-install | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'ipa-client/ipa-install/ipa-client-install') diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index fb4f3c19f..b1e001cd3 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -529,7 +529,10 @@ def main(): # Create the discovery instance ds = ipaclient.ipadiscovery.IPADiscovery() - ret = ds.search() + if options.on_master: + ret = ds.search(domain=options.domain, server=options.server) + else: + ret = ds.search() if ret == -10: print "Can't get the fully qualified name of this host" print "Please check that the client is properly configured" @@ -543,7 +546,10 @@ def main(): else: print "DNS discovery failed to determine your DNS domain" cli_domain = user_input("Please provide the domain name of your IPA server (ex: example.com)", allow_empty = False) - ret = ds.search(domain=cli_domain) + if options.on_master: + ret = ds.search(domain=options.domain, server=options.server) + else: + ret = ds.search(domain=cli_domain) if not cli_domain: if ds.getDomainName(): cli_domain = ds.getDomainName() -- cgit