Refactored config.ticket-399

1 files changed, 35 insertions, 37 deletions

diff --git a/base/deploy/src/scriptlets/pkiconfig.py b/base/deploy/src/scriptlets/pkiconfig.py
index d1cc35347..5049e40a8 100644
--- a/base/deploy/src/scriptlets/pkiconfig.py
+++ b/base/deploy/src/scriptlets/pkiconfig.py
@@ -152,40 +152,38 @@ class PKIConfig:
         print
         return
 
-
-# PKI Deployment Global Variables
-pki_install_time = None
-pki_timestamp = None
-pki_architecture = None
-pki_hostname = None
-
-
-# PKI Deployment Command-Line Variables
-pki_deployment_executable = None
-
-# PKI Deployment "Mandatory" Command-Line Variables
-pki_subsystem = None
-#     'pkispawn' ONLY
-pkideployment_cfg = None
-#     'pkidestroy' ONLY
-pki_deployed_instance_name = None
-
-# PKI Deployment "Optional" Command-Line Variables
-#     'pkispawn' ONLY
-pki_update_flag = False
-
-# PKI Deployment "Test" Command-Line Variables
-pki_root_prefix = None
-
-
-# PKI Deployment Global Dictionaries
-pki_sensitive_dict = None
-pki_common_dict = None
-pki_web_server_dict = None
-pki_subsystem_dict = None
-pki_master_dict = None
-pki_slots_dict = None
-pki_master_jython_dict = None
-
-# PKI Selinux parameters
-pki_selinux_config_ports = []
+    def __init__(self):
+        # PKI Deployment Global Variables
+        self.pki_install_time = None
+        self.pki_timestamp = None
+        self.pki_architecture = None
+        self.pki_hostname = None
+
+        # PKI Deployment Command-Line Variables
+        self.pki_deployment_executable = None
+
+        # PKI Deployment "Mandatory" Command-Line Variables
+        self.pki_subsystem = None
+        #     'pkispawn' ONLY
+        self.pkideployment_cfg = None
+        #     'pkidestroy' ONLY
+        self.pki_deployed_instance_name = None
+
+        # PKI Deployment "Optional" Command-Line Variables
+        #     'pkispawn' ONLY
+        self.pki_update_flag = False
+
+        # PKI Deployment "Test" Command-Line Variables
+        self.pki_root_prefix = None
+
+        # PKI Deployment Global Dictionaries
+        self.pki_sensitive_dict = None
+        self.pki_common_dict = None
+        self.pki_web_server_dict = None
+        self.pki_subsystem_dict = None
+        self.pki_master_dict = None
+        self.pki_slots_dict = None
+        self.pki_master_jython_dict = None
+
+        # PKI Selinux parameters
+        self.pki_selinux_config_ports = []