1 files changed, 20 insertions, 9 deletions
diff --git a/ipa-server/ipa-install/ipa-replica-install b/ipa-server/ipa-install/ipa-replica-install
index 93cfc864..234a624b 100644
--- a/ipa-server/ipa-install/ipa-replica-install
+++ b/ipa-server/ipa-install/ipa-replica-install
@@ -42,6 +42,8 @@ class ReplicaConfig:
 def parse_options():
     from optparse import OptionParser
     parser = OptionParser()
+    parser.add_option("-N", "--no-ntp", dest="conf_ntp", action="store_false",
+                      help="do not configure ntp", default=True)
     parser.add_option("-d", "--debug", dest="debug", action="store_true",
                       default=False, help="gather extra debugging information")
 
@@ -134,7 +136,7 @@ def main():
     installutils.standard_logging_setup("ipareplica-install.log", options.debug)
 
     top_dir, dir = expand_info(filename)
-    
+
     config = ReplicaConfig()
     read_info(dir, config)
     config.host_name = get_host_name()
@@ -171,8 +173,14 @@ def main():
     except ldap.INVALID_CREDENTIALS, e :
         sys.exit("\nThe password provided is incorrect for LDAP server %s" % config.master_host_name)
 
+    # Configure ntpd
+    if options.conf_ntp:
+        ntp = ntpinstance.NTPInstance()
+        ntp.create_instance()
+
+    # Configure dirsrv
     install_ds(config)
-    
+
     repl = replication.ReplicationManager(config.host_name, config.dirman_password)
     if repl is None:
         raise RuntimeError("Unable to connect to LDAP server %s." % config.host_name)
@@ -184,18 +192,21 @@ def main():
 
     install_krb(config)
     install_http(config)
-    
+
     # Create a Web Gui instance
     webgui = httpinstance.WebGuiInstance()
     webgui.create_instance()
 
-    # Configure ntpd
-    ntp = ntpinstance.NTPInstance()
-    ntp.create_instance()
-
     service.restart("dirsrv")
     service.restart("krb5kdc")
-    
+
+    # Call client install script
+    try:
+        run(["/usr/sbin/ipa-client-install", "--on-master", "--unattended", "--domain", config.domain_name, "--server", config.host_name, "--realm", config.realm_name])
+    except Exception, e:
+        print "Configuration of client side components failed!"
+        print "ipa-client-install returned: " + str(e)
+        raise RuntimeError("Failed to configure the client")
 try:
     if not os.geteuid()==0:
         sys.exit("\nYou must be root to run this script.\n")
@@ -207,4 +218,4 @@ except Exception, e:
     for str in traceback.format_tb(sys.exc_info()[2]):
         message = message + "\n" + str
     logging.debug(message)
-    sys.exit(1)    
+    sys.exit(1)