summaryrefslogtreecommitdiffstats
path: root/base/deploy/src/scriptlets/pkijython.py
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-12-18 14:46:41 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2013-01-31 12:26:01 -0500
commitb7b3bcfecc792ea689af2ecc554e12b42a58f1ce (patch)
treed23d7331d80c858f8c92f68a415cde1a3aaf24f8 /base/deploy/src/scriptlets/pkijython.py
parentae6e575f56917107b2a3de7997bc13e203c2c856 (diff)
downloadpki-b7b3bcfecc792ea689af2ecc554e12b42a58f1ce.tar.gz
pki-b7b3bcfecc792ea689af2ecc554e12b42a58f1ce.tar.xz
pki-b7b3bcfecc792ea689af2ecc554e12b42a58f1ce.zip
Added interactive subsystem installation.ticket-380-8
The pkispawn has been modified such that the configuration file and subsystem type are optional. The pkidestroy has been modified such that the instance name and subsystem type are optional. If any of these options are not specified they will enter an interactive mode. Ticket #380
Diffstat (limited to 'base/deploy/src/scriptlets/pkijython.py')
-rw-r--r--base/deploy/src/scriptlets/pkijython.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/base/deploy/src/scriptlets/pkijython.py b/base/deploy/src/scriptlets/pkijython.py
index a7635c130..4768d8af9 100644
--- a/base/deploy/src/scriptlets/pkijython.py
+++ b/base/deploy/src/scriptlets/pkijython.py
@@ -566,9 +566,7 @@ class rest_client:
javasystem.out.println(log.PKI_JYTHON_RESPONSE_ADMIN_CERT +\
" " + admin_cert)
# Store the Administration Certificate in a file
- admin_cert_file = os.path.join(
- master['pki_client_dir'],
- master['pki_client_admin_cert'])
+ admin_cert_file = master['pki_client_admin_cert']
admin_cert_bin_file = admin_cert_file + ".der"
javasystem.out.println(log.PKI_JYTHON_ADMIN_CERT_SAVE +\
" " + "'" + admin_cert_file + "'")