From df7087813ee2bd14c2c78928b8766c37c579e9c2 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Wed, 14 Nov 2012 00:53:04 -0500
Subject: Refactored config.

---
 base/deploy/src/scriptlets/finalization.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'base/deploy/src/scriptlets/finalization.py')

diff --git a/base/deploy/src/scriptlets/finalization.py b/base/deploy/src/scriptlets/finalization.py
index 35cff6dd2..0e4f55f74 100644
--- a/base/deploy/src/scriptlets/finalization.py
+++ b/base/deploy/src/scriptlets/finalization.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
@@ -34,7 +33,8 @@ import pkiscriptlet
 class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
     rv = 0
 
-    def spawn(self):
+    def spawn(self, config):
+        master = config.pki_master_dict
         if util.str2bool(master['pki_skip_installation']):
             pkilogging.pki_log.info(log.SKIP_FINALIZATION_SPAWN_1, __name__,
                                 extra=PKIConfig.PKI_INDENTATION_LEVEL_1)
@@ -74,7 +74,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
         # If instance has not been configured, print the
         # configuration URL to the log
         if util.str2bool(master['pki_skip_configuration']):
-            util.configuration_file.log_configuration_url()
+            util.configuration_file.log_configuration_url(config)
         # Log final process messages
         pkilogging.pki_log.info(log.PKISPAWN_END_MESSAGE_2,
                             master['pki_subsystem'],
@@ -84,7 +84,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
         # If instance has not been configured, print the
         # configuration URL to the screen
         if util.str2bool(master['pki_skip_configuration']):
-            util.configuration_file.display_configuration_url()
+            util.configuration_file.display_configuration_url(config)
         return self.rv
 
     def respawn(self):
@@ -93,6 +93,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
         return self.rv
 
     def destroy(self):
+        master = config.pki_master_dict
         pkilogging.pki_log.info(log.FINALIZATION_DESTROY_1, __name__,
                             extra=PKIConfig.PKI_INDENTATION_LEVEL_1)
         util.file.modify(master['pki_destroy_log'], silent=True)
-- 
cgit