[Pki-devel] [PATCH] fix issue with pki_external being referenced when not a CA

[Ade Lee]

made change suggested. pushed to master

On Fri, 2012-11-09 at 15:05 -0800, Matthew Harmsen wrote:
> On 11/09/12 13:41, Ade Lee wrote:
> 
> > Please review. Ade 
> > 
> > 
> > _______________________________________________ Pki-devel mailing
> > list Pki-devel at redhat.com
> > https://www.redhat.com/mailman/listinfo/pki-devel 
> Ade,
> 
> You also only need to test clones against Tomcat systems:
>         diff --git a/base/deploy/src/scriptlets/pkiparser.py
>         b/base/deploy/src/scriptlet
>         index a108932..8c7ea90 100644
>         --- a/base/deploy/src/scriptlets/pkiparser.py
>         +++ b/base/deploy/src/scriptlets/pkiparser.py
>         @@ -1455,19 +1455,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 + " " +\
> -- Matt