summaryrefslogtreecommitdiffstats
path: root/base/deploy/src/scriptlets/pkiparser.py
diff options
context:
space:
mode:
Diffstat (limited to 'base/deploy/src/scriptlets/pkiparser.py')
-rw-r--r--base/deploy/src/scriptlets/pkiparser.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py
index 0d811af6e..6103ce9e5 100644
--- a/base/deploy/src/scriptlets/pkiparser.py
+++ b/base/deploy/src/scriptlets/pkiparser.py
@@ -171,7 +171,7 @@ class PKIConfigParser:
deployed_pki_subsystem_path + "/" +\
"registry" + "/" +\
config.pki_subsystem.lower() + "/" +\
- config.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE
+ config.PKI_DEPLOYMENT_CONFIGURATION_FILE
# always verify that configuration file exists
if not os.path.exists(config.pkideployment_cfg) or\
not os.path.isfile(config.pkideployment_cfg):
@@ -215,7 +215,9 @@ class PKIConfigParser:
self.pki_config = ConfigParser.ConfigParser()
# Make keys case-sensitive!
self.pki_config.optionxform = str
- self.pki_config.read(config.pkideployment_cfg)
+ self.pki_config.read([
+ config.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE,
+ config.pkideployment_cfg])
config.pki_default_dict = self.pki_config.defaults()
pkilogging.sensitive_parameters = config.pki_default_dict['sensitive_parameters'].split()
config.pki_common_dict = dict(self.pki_config._sections['Common'])
@@ -2302,11 +2304,11 @@ class PKIConfigParser:
# Finalization name/value pairs
config.pki_master_dict['pki_deployment_cfg_replica'] =\
os.path.join(config.pki_master_dict['pki_subsystem_registry_path'],
- config.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE)
+ config.PKI_DEPLOYMENT_CONFIGURATION_FILE)
config.pki_master_dict['pki_deployment_cfg_spawn_archive'] =\
config.pki_master_dict['pki_subsystem_archive_log_path'] + "/" +\
"spawn" + "_" +\
- config.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE + "." +\
+ config.PKI_DEPLOYMENT_CONFIGURATION_FILE + "." +\
config.pki_master_dict['pki_timestamp']
config.pki_master_dict['pki_manifest'] =\
config.pki_master_dict['pki_subsystem_registry_path'] + "/" +\