From ffea6de5f4795cd9f6557e775c82a0342636b736 Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Tue, 18 Dec 2012 13:15:14 -0500 Subject: Revert to using default config file for pkidestroy Previously, we archived the default config file when an instance was created, and used that file in running pkidestroy. We plan to replace this mechanism in favor of actually reading the instance's config files. For now, we return to using the standard default config template, so that we can change it without breaking pkidestroy. --- base/deploy/src/pkidestroy | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'base/deploy/src/pkidestroy') 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" + "/" +\ -- cgit