diff options
author | Ade Lee <alee@redhat.com> | 2012-09-11 15:42:36 -0400 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2012-09-12 21:39:47 -0400 |
commit | d7b67c5ba1cf193c50cd46ec4bdef79646bce1af (patch) | |
tree | ad1c6a592d2ca7538b97115ef8c4bd3daa36f793 /base/deploy/src/scriptlets/configuration.jy | |
parent | edd986d94f173ea9f63f105eaf0039327bc6f2e9 (diff) | |
download | pki-d7b67c5ba1cf193c50cd46ec4bdef79646bce1af.tar.gz pki-d7b67c5ba1cf193c50cd46ec4bdef79646bce1af.tar.xz pki-d7b67c5ba1cf193c50cd46ec4bdef79646bce1af.zip |
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
Diffstat (limited to 'base/deploy/src/scriptlets/configuration.jy')
-rw-r--r-- | base/deploy/src/scriptlets/configuration.jy | 14 |
1 files changed, 5 insertions, 9 deletions
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) |