diff options
| author | Ade Lee <alee@redhat.com> | 2012-11-09 16:30:48 -0500 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2012-11-10 23:11:04 -0500 |
| commit | 64eaca2bb3f8df435db3daefdff7f03856fe0f12 (patch) | |
| tree | 201175d8d8c734d98025579ef9736977db56017a /base | |
| parent | 318716f3425a1d818e0633453a1d27a68d2f7f5f (diff) | |
| download | pki-64eaca2bb3f8df435db3daefdff7f03856fe0f12.tar.gz pki-64eaca2bb3f8df435db3daefdff7f03856fe0f12.tar.xz pki-64eaca2bb3f8df435db3daefdff7f03856fe0f12.zip | |
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
Diffstat (limited to 'base')
| -rw-r--r-- | base/deploy/src/scriptlets/pkiparser.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py index 4938e7c8c..4f2757359 100644 --- a/base/deploy/src/scriptlets/pkiparser.py +++ b/base/deploy/src/scriptlets/pkiparser.py @@ -1448,19 +1448,23 @@ def compose_pki_master_dictionary(): if not len(config.pki_master_dict['pki_security_domain_user']): config.pki_master_dict['pki_security_domain_user'] = "caadmin" if not len(config.pki_master_dict['pki_subsystem_name']): - if config.str2bool(config.pki_master_dict['pki_clone']): + if config.pki_master_dict['pki_subsystem'] in\ + config.PKI_TOMCAT_SUBSYSTEMS and \ + config.str2bool(config.pki_master_dict['pki_clone']): config.pki_master_dict['pki_subsystem_name'] =\ config.PKI_DEPLOYMENT_CLONED_PKI_SUBSYSTEM + " " +\ 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 + " " +\ |