Refactored config.ticket-399

1 files changed, 4 insertions, 3 deletions

diff --git a/base/deploy/src/scriptlets/initialization.py b/base/deploy/src/scriptlets/initialization.py
index 98aed9455..c2ad1c597 100644
--- a/base/deploy/src/scriptlets/initialization.py
+++ b/base/deploy/src/scriptlets/initialization.py
@@ -20,7 +20,6 @@
 #
 
 # PKI Deployment Imports
-import pkiconfig as config
 from pkiconfig import PKIConfig
 from pkiconfig import pki_master_dict as master
 import pkihelper as util
@@ -33,7 +32,8 @@ import pkiscriptlet
 class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
     rv = 0
 
-    def spawn(self):
+    def spawn(self, config):
+        master = config.pki_master_dict
         # begin official logging
         pkilogging.pki_log.info(log.PKISPAWN_BEGIN_MESSAGE_2,
                             master['pki_subsystem'],
@@ -56,7 +56,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
         util.identity.set_uid(master['pki_user'])
         util.identity.set_gid(master['pki_group'])
         # verify existence of SENSITIVE configuration file data
-        util.configuration_file.verify_sensitive_data()
+        util.configuration_file.verify_sensitive_data(config)
         # verify existence of MUTUALLY EXCLUSIVE configuration file data
         util.configuration_file.verify_mutually_exclusive_data()
         # verify existence of PREDEFINED configuration file data
@@ -80,6 +80,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
         return self.rv
 
     def destroy(self):
+        master = config.pki_master_dict
         # begin official logging
         pkilogging.pki_log.info(log.PKIDESTROY_BEGIN_MESSAGE_2,
                             master['pki_subsystem'],