summaryrefslogtreecommitdiffstats
path: root/base/deploy/src/pkidestroy
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2012-12-18 13:15:14 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-12-18 17:12:06 -0500
commitfa14c46e0c1621170848ea739a472b2c43653c5d (patch)
treec876c09134b34a4c77f17cda0be3244f7261679b /base/deploy/src/pkidestroy
parentbe2c970d1aba4a441700a05bc1f7380fc7aedb7c (diff)
downloadpki-fa14c46e0c1621170848ea739a472b2c43653c5d.tar.gz
pki-fa14c46e0c1621170848ea739a472b2c43653c5d.tar.xz
pki-fa14c46e0c1621170848ea739a472b2c43653c5d.zip
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.
Diffstat (limited to 'base/deploy/src/pkidestroy')
-rwxr-xr-xbase/deploy/src/pkidestroy7
1 files changed, 2 insertions, 5 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" + "/" +\