diff options
| -rwxr-xr-x | base/deploy/src/pkidestroy | 7 | ||||
| -rw-r--r-- | base/deploy/src/scriptlets/finalization.py | 2 | ||||
| -rw-r--r-- | base/deploy/src/scriptlets/pkiparser.py | 5 |
3 files changed, 2 insertions, 12 deletions
diff --git a/base/deploy/src/pkidestroy b/base/deploy/src/pkidestroy index 7d30d743a..edb57e9ac 100755 --- a/base/deploy/src/pkidestroy +++ b/base/deploy/src/pkidestroy @@ -125,12 +125,9 @@ def main(argv): print parser.arg_parser.exit(-1); + config.default_deployment_cfg = config.PKI_DEPLOYMENT_DEFAULT_CONFIGURATION_FILE + # establish complete path to previously deployed configuration file - config.default_deployment_cfg =\ - deployed_pki_subsystem_path + "/" +\ - "registry" + "/" +\ - config.pki_subsystem.lower() + "/" +\ - config.DEFAULT_DEPLOYMENT_CONFIGURATION config.user_deployment_cfg =\ deployed_pki_subsystem_path + "/" +\ "registry" + "/" +\ diff --git a/base/deploy/src/scriptlets/finalization.py b/base/deploy/src/scriptlets/finalization.py index fa8a31e1f..8fe643e15 100644 --- a/base/deploy/src/scriptlets/finalization.py +++ b/base/deploy/src/scriptlets/finalization.py @@ -47,8 +47,6 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): extra=config.PKI_INDENTATION_LEVEL_1) # For debugging/auditing purposes, save a timestamped copy of # this configuration file in the subsystem archive - util.file.copy(master['pki_default_deployment_cfg_replica'], - master['pki_default_deployment_cfg_spawn_archive']) util.file.copy(master['pki_user_deployment_cfg_replica'], master['pki_user_deployment_cfg_spawn_archive']) # Save a copy of the installation manifest file diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py index e4a6aed85..2a4111f91 100644 --- a/base/deploy/src/scriptlets/pkiparser.py +++ b/base/deploy/src/scriptlets/pkiparser.py @@ -913,11 +913,6 @@ class PKIConfigParser: config.pki_master_dict['pki_user_deployment_cfg_replica'] =\ os.path.join(config.pki_master_dict['pki_subsystem_registry_path'], config.USER_DEPLOYMENT_CONFIGURATION) - config.pki_master_dict['pki_default_deployment_cfg_spawn_archive'] =\ - config.pki_master_dict['pki_subsystem_archive_log_path'] + "/" +\ - "spawn" + "_" +\ - config.DEFAULT_DEPLOYMENT_CONFIGURATION + "." +\ - config.pki_master_dict['pki_timestamp'] config.pki_master_dict['pki_user_deployment_cfg_spawn_archive'] =\ config.pki_master_dict['pki_subsystem_archive_log_path'] + "/" +\ "spawn" + "_" +\ |