Refactor PKIDeployer.import_master_config()

The PKIDeployer.import_master_config() has been modified such
that it will be executed during cloning, but it will only
retrieve and validate database config params from the master
if they are needed to set up DS replication.

base/server/python/pki/server/deployment/__init__.py

@@ -1386,16 +1386,21 @@ def import_master_config(self, subsystem):
 
         logger.info('Retrieving config params from %s master', subsystem.type)
 
-        names = [
-            'internaldb.ldapauth.password',
-            'internaldb.replication.password'
-        ]
+        names = []
+        substores = []
 
-        substores = [
-            'internaldb',
-            'internaldb.ldapauth',
-            'internaldb.ldapconn'
-        ]
+        if config.str2bool(self.mdict['pki_ds_setup']):
+
+            names.extend([
+                'internaldb.ldapauth.password',
+                'internaldb.replication.password'
+            ])
+
+            substores.extend([
+                'internaldb',
+                'internaldb.ldapauth',
+                'internaldb.ldapconn'
+            ])
 
         tags = subsystem.config['preop.cert.list'].split(',')
         for tag in tags:
@@ -1424,18 +1429,20 @@ def import_master_config(self, subsystem):
             substores,
             session_id=self.install_token.token)
 
-        logger.info('Validating %s master config params', subsystem.type)
-
         master_properties = master_config['Properties']
 
-        master_hostname = master_properties['internaldb.ldapconn.host']
-        master_port = master_properties['internaldb.ldapconn.port']
+        if config.str2bool(self.mdict['pki_ds_setup']):
+
+            logger.info('Validating %s master config params', subsystem.type)
+
+            master_hostname = master_properties['internaldb.ldapconn.host']
+            master_port = master_properties['internaldb.ldapconn.port']
 
-        replica_hostname = subsystem.config['internaldb.ldapconn.host']
-        replica_port = subsystem.config['internaldb.ldapconn.port']
+            replica_hostname = subsystem.config['internaldb.ldapconn.host']
+            replica_port = subsystem.config['internaldb.ldapconn.port']
 
-        if master_hostname == replica_hostname and master_port == replica_port:
-            raise Exception('Master and replica must not share LDAP database')
+            if master_hostname == replica_hostname and master_port == replica_port:
+                raise Exception('Master and replica must not share LDAP database')
 
         logger.info('Importing %s master config params', subsystem.type)
 

base/server/python/pki/server/deployment/scriptlets/configuration.py

@@ -185,13 +185,15 @@ def spawn(self, deployer):
 
         subsystem.save()
 
+        if clone:
+            master_config = deployer.import_master_config(subsystem)
+        else:
+            master_config = None
+
         if config.str2bool(deployer.mdict['pki_ds_setup']):
 
             if clone:
                 deployer.request_ranges(subsystem)
-                master_config = deployer.import_master_config(subsystem)
-            else:
-                master_config = None
 
             deployer.setup_database(subsystem, master_config)