<html> <head> <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"> </head> <body bgcolor="#FFFFFF" text="#000000"> <div class="moz-cite-prefix"><tt>On 11/09/12 13:41, Ade Lee wrote:</tt><tt> </tt></div> <blockquote cite="mid:1352497320.19165.4.camel@aleeredhat.laptop" type="cite"><tt>Please review. Ade </tt><tt> </tt><tt> </tt> <fieldset class="mimeAttachmentHeader"></fieldset> <tt> </tt><tt>_______________________________________________ Pki-devel mailing list <a class="moz-txt-link-abbreviated" href="mailto:Pki-devel@redhat.com">Pki-devel@redhat.com</a> <a class="moz-txt-link-freetext" href="https://www.redhat.com/mailman/listinfo/pki-devel">https://www.redhat.com/mailman/listinfo/pki-devel</a></tt> </blockquote> <tt>Ade,</tt><tt> </tt><tt> </tt><tt>You also only need to test clones against Tomcat systems:</tt><tt> </tt> <blockquote><tt>diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlet</tt><tt> </tt><tt>index a108932..8c7ea90 100644</tt><tt> </tt><tt>--- a/base/deploy/src/scriptlets/pkiparser.py</tt><tt> </tt><tt>+++ b/base/deploy/src/scriptlets/pkiparser.py</tt><tt> </tt><tt>@@ -1455,19 +1455,23 @@ def compose_pki_master_dictionary():</tt><tt> </tt><tt> if not len(config.pki_master_dict['pki_security_domain_user']):</tt><tt> </tt><tt> config.pki_master_dict['pki_security_domain_user'] = "caadmin"</tt><tt> </tt><tt> if not len(config.pki_master_dict['pki_subsystem_name']):</tt><tt> </tt><tt>- if config.str2bool(config.pki_master_dict['pki_clone']):</tt><tt> </tt><tt>+ if config.pki_master_dict['pki_subsystem'] in\</tt><tt> </tt><tt>+ config.PKI_TOMCAT_SUBSYSTEMS and \</tt><tt> </tt><tt>+ config.str2bool(config.pki_master_dict['pki_clone']):</tt><tt> </tt><tt> config.pki_master_dict['pki_subsystem_name'] =\</tt><tt> </tt><tt> config.PKI_DEPLOYMENT_CLONED_PKI_SUBSYSTEM + " " +\</tt><tt> </tt><tt> config.pki_subsystem + " " +\</tt><tt> </tt><tt> config.pki_master_dict['pki_hostname'] + " " +\</tt><tt> </tt><tt> config.pki_master_dict['pki_https_port']</tt><tt> </tt><tt>- elif config.str2bool(config.pki_master_dict['pki_external']):</tt><tt> </tt><tt>+ elif config.pki_subsystem == "CA" and \</tt><tt> </tt><tt>+ config.str2bool(config.pki_master_dict['pki_external']):</tt><tt> </tt><tt> config.pki_master_dict['pki_subsystem_name'] =\</tt><tt> </tt><tt> config.PKI_DEPLOYMENT_EXTERNAL_CA + " " +\</tt><tt> </tt><tt> config.pki_subsystem + " " +\</tt><tt> </tt><tt> config.pki_master_dict['pki_hostname'] + " " +\</tt><tt> </tt><tt> config.pki_master_dict['pki_https_port']</tt><tt> </tt><tt>- elif config.str2bool(config.pki_master_dict['pki_subordinate']):</tt><tt> </tt><tt>+ elif config.pki_subsystem == "CA" and \</tt><tt> </tt><tt>+ config.str2bool(config.pki_master_dict['pki_subordinate']):</tt><tt> </tt><tt> config.pki_master_dict['pki_subsystem_name'] =\</tt><tt> </tt><tt> config.PKI_DEPLOYMENT_SUBORDINATE_CA + " " +\</tt><tt> </tt><tt> config.pki_subsystem + " " +\</tt><tt> </tt></blockquote> <tt>-- Matt</tt> </body> </html>