summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2012-11-09 16:30:48 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-11-10 00:35:37 -0500
commit482ca81e30b2951c536f9f5df86aff2cdc2e40d3 (patch)
tree8bf65d78844c5704cb9fd15ed1b14bf103d2e569
parent52aef3dfb125d87e7857b196cc319dbe951a9e92 (diff)
downloadpki-482ca81e30b2951c536f9f5df86aff2cdc2e40d3.zip
pki-482ca81e30b2951c536f9f5df86aff2cdc2e40d3.tar.gz
pki-482ca81e30b2951c536f9f5df86aff2cdc2e40d3.tar.xz
Fix issue with pki_external being referenced for non-CA
This fixes an error in a previous commit which breaks creation and removal of non-CA subsystems
-rw-r--r--base/deploy/src/scriptlets/pkiparser.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py
index 4938e7c..73b34a4 100644
--- a/base/deploy/src/scriptlets/pkiparser.py
+++ b/base/deploy/src/scriptlets/pkiparser.py
@@ -1454,13 +1454,15 @@ def compose_pki_master_dictionary():
config.pki_subsystem + " " +\
config.pki_master_dict['pki_hostname'] + " " +\
config.pki_master_dict['pki_https_port']
- elif config.str2bool(config.pki_master_dict['pki_external']):
+ elif config.pki_subsystem == "CA" and \
+ config.str2bool(config.pki_master_dict['pki_external']):
config.pki_master_dict['pki_subsystem_name'] =\
config.PKI_DEPLOYMENT_EXTERNAL_CA + " " +\
config.pki_subsystem + " " +\
config.pki_master_dict['pki_hostname'] + " " +\
config.pki_master_dict['pki_https_port']
- elif config.str2bool(config.pki_master_dict['pki_subordinate']):
+ elif config.pki_subsystem == "CA" and \
+ config.str2bool(config.pki_master_dict['pki_subordinate']):
config.pki_master_dict['pki_subsystem_name'] =\
config.PKI_DEPLOYMENT_SUBORDINATE_CA + " " +\
config.pki_subsystem + " " +\