From d7b67c5ba1cf193c50cd46ec4bdef79646bce1af Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Tue, 11 Sep 2012 15:42:36 -0400 Subject: Various fixes to installation servlet and pki-deploy Added logging so that we can see what is passed in to server from pkispawn. Fixed incorrect dbuser specification. Added required replication config items to pkispawn. Initial refactoring of construct_pki_configuration_data in pkijython.py --- base/deploy/src/scriptlets/configuration.jy | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'base/deploy/src/scriptlets/configuration.jy') diff --git a/base/deploy/src/scriptlets/configuration.jy b/base/deploy/src/scriptlets/configuration.jy index a53cf9d76..0f5968bce 100644 --- a/base/deploy/src/scriptlets/configuration.jy +++ b/base/deploy/src/scriptlets/configuration.jy @@ -86,8 +86,8 @@ def main(argv): # Establish REST Client client = jyutil.rest_client.initialize( client_config, - master['pki_dry_run_flag'], - master['pki_jython_log_level']) + master, + sensitive) # Construct PKI Subsystem Configuration Data data = None @@ -123,17 +123,13 @@ def main(argv): else: # PKI or Cloned CA data = jyutil.rest_client.construct_pki_configuration_data( - master, sensitive, token) + token) else: # PKI or Cloned KRA, OCSP, or TKS - data = jyutil.rest_client.construct_pki_configuration_data( - master, sensitive, token) + data = jyutil.rest_client.construct_pki_configuration_data(token) # Formulate PKI Subsystem Configuration Data Response - jyutil.rest_client.configure_pki_data(data, - master, - sensitive) - + jyutil.rest_client.configure_pki_data(data) if __name__ == "__main__": main(sys.argv) -- cgit