diff options
Diffstat (limited to 'base/deploy/src/pkispawn')
| -rwxr-xr-x | base/deploy/src/pkispawn | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/base/deploy/src/pkispawn b/base/deploy/src/pkispawn index 4ed9e3086..9e5776c21 100755 --- a/base/deploy/src/pkispawn +++ b/base/deploy/src/pkispawn @@ -35,7 +35,6 @@ try: import subprocess import time from time import strftime as date - from pki.deployment import pkiconfig as config from pki.deployment.pkiconfig import PKIConfig from pki.deployment.pkiparser import PKIConfigParser from pki.deployment import pkilogging @@ -61,6 +60,8 @@ def main(argv): # Set the umask os.umask(PKIConfig.PKI_DEPLOYMENT_DEFAULT_UMASK) + config = PKIConfig() + # Set installation time ticks = time.time() config.pki_install_time = time.asctime(time.localtime(ticks)) @@ -94,7 +95,7 @@ def main(argv): # Read and process command-line arguments. parser = PKIConfigParser() - parser.process_command_line_arguments(argv) + parser.process_command_line_arguments(argv, config) if not os.path.exists(PKIConfig.PKI_DEPLOYMENT_SOURCE_ROOT +\ "/" + config.pki_subsystem.lower()): @@ -135,7 +136,7 @@ def main(argv): sys.exit(1) # Read the specified PKI configuration file. - rv = parser.read_pki_configuration_file() + rv = parser.read_pki_configuration_file(config) if rv != 0: pkilogging.pki_log.error(PKI_UNABLE_TO_PARSE_1, rv, extra=PKIConfig.PKI_INDENTATION_LEVEL_0) @@ -170,14 +171,14 @@ def main(argv): extra=PKIConfig.PKI_INDENTATION_LEVEL_0) # Read in the PKI slots configuration file. - parser.compose_pki_slots_dictionary() + parser.compose_pki_slots_dictionary(config) pkilogging.pki_log.debug(log.PKI_DICTIONARY_SLOTS, extra=PKIConfig.PKI_INDENTATION_LEVEL_0) pkilogging.pki_log.debug(pp.pformat(config.pki_slots_dict), extra=PKIConfig.PKI_INDENTATION_LEVEL_0) # Combine the various sectional dictionaries into a PKI master dictionary - parser.compose_pki_master_dictionary() + parser.compose_pki_master_dictionary(config) if not config.pki_update_flag: config.pki_master_dict['pki_spawn_log'] = pkilogging.pki_log_dir + "/" +\ pkilogging.pki_log_name @@ -209,7 +210,7 @@ def main(argv): fromlist = [pki_scriptlet[4:]]) instance = scriptlet.PkiScriptlet() if not config.pki_update_flag: - rv = instance.spawn() + rv = instance.spawn(config) else: rv = instance.respawn() if rv != 0: |