Update PKIConfigParser.compose_pki_master_dictionary()

The PKIConfigParser.compose_pki_master_dictionary() has been
updated to take a user_deployment_cfg param instead of using
the global config.user_deployment_cfg.

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

@@ -678,7 +678,7 @@ def normalize_cert_token(self, name):
         # update cert token
         self.mdict[name] = token
 
-    def compose_pki_master_dictionary(self):
+    def compose_pki_master_dictionary(self, user_deployment_cfg):
         """
         Create a single master PKI dictionary from the
         sectional dictionaries
@@ -691,7 +691,7 @@ def compose_pki_master_dictionary(self):
             self.mdict['pki_timestamp'] = self.deployer.log_timestamp
             self.mdict['pki_certificate_timestamp'] = self.deployer.certificate_timestamp
             self.mdict['pki_architecture'] = self.deployer.architecture
-            self.mdict['pki_user_deployment_cfg'] = config.user_deployment_cfg
+            self.mdict['pki_user_deployment_cfg'] = user_deployment_cfg
             self.mdict['pki_deployed_instance_name'] = \
                 config.pki_deployed_instance_name
 

base/server/python/pki/server/pkidestroy.py

@@ -224,7 +224,7 @@ def main(argv):
         sys.exit(1)
 
     # Combine the various sectional dictionaries into a PKI master dictionary
-    parser.compose_pki_master_dictionary()
+    parser.compose_pki_master_dictionary(config.user_deployment_cfg)
     deployer.init()
 
     if args.log_file:

base/server/python/pki/server/pkispawn.py

@@ -710,7 +710,7 @@ def sanitize_user_deployment_cfg(cfg):
 def create_master_dictionary(parser):
 
     # Combine the various sectional dictionaries into a PKI master dictionary
-    parser.compose_pki_master_dictionary()
+    parser.compose_pki_master_dictionary(config.user_deployment_cfg)
 
     logger.debug(log.PKI_DICTIONARY_MASTER)
     logger.debug(pkilogging.log_format(parser.mdict))