2 files changed, 29 insertions, 7 deletions
diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py
index 1a09f4964..58188657d 100644
--- a/base/server/python/pki/server/deployment/pkihelper.py
+++ b/base/server/python/pki/server/deployment/pkihelper.py
@@ -4584,12 +4584,33 @@ class SystemCertificateVerifier:
 class PKIDeployer:
     """Holds the global dictionaries and the utility objects"""
 
-    def __init__(self, pki_mdict, slots_dict=None):
+    def __init__(self):
         # Global dictionary variables
-        self.mdict = pki_mdict
-        self.slots = slots_dict
+        self.mdict = {}
+        self.slots = {}
         self.manifest_db = []
 
+        self.identity = None
+        self.namespace = None
+        self.configuration_file = None
+        self.instance = None
+        self.directory = None
+        self.file = None
+        self.symlink = None
+        self.war = None
+        self.password = None
+        self.hsm = None
+        self.certutil = None
+        self.modutil = None
+        self.pk12util = None
+        self.kra_connector = None
+        self.security_domain = None
+        self.servercertnick_conf = None
+        self.systemd = None
+        self.tps_connector = None
+        self.config_client = None
+
+    def init(self):
         # Utility objects
         self.identity = Identity(self)
         self.namespace = Namespace(self)
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py
index 6e922cf6c..027703bbc 100644
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
@@ -54,7 +54,8 @@ class PKIConfigParser:
     COMMENT_CHAR = '#'
     OPTION_CHAR = '='
 
-    def __init__(self, description, epilog):
+    def __init__(self, description, epilog, deployer=None):
+        self.deployer = deployer
         self.pki_config = None
 
         # Read and process command-line options
@@ -101,8 +102,8 @@ class PKIConfigParser:
         self.authdb_connection = None
 
         # Master and Slot dictionaries
-        self.mdict = dict()
-        self.slots_dict = dict()
+        self.mdict = deployer.mdict
+        self.slots_dict = deployer.slots
 
     # PKI Deployment Helper Functions
     def process_command_line_arguments(self):
@@ -1385,7 +1386,7 @@ class PKIConfigParser:
             parser.optionxform = str
             parser.read(config.PKI_DEPLOYMENT_SLOTS_CONFIGURATION_FILE)
             # Slots configuration file name/value pairs
-            self.slots_dict = dict(parser.items('Tomcat'))
+            self.slots_dict.update(dict(parser.items('Tomcat')))
         except configparser.ParsingError as err:
             rv = err
         return rv