From 4f35f31da63203c0e4c7cb22f94b9d09a04b7521 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Fri, 27 Oct 2023 07:51:22 -0400 Subject: [PATCH] Fix ca name, fix zosmf trust, and shorten retry time to not waste build time on failures Signed-off-by: 1000TurquoisePogs --- bin/commands/init/certificate/index.ts | 6 ++---- playbooks/roles/start/defaults/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/bin/commands/init/certificate/index.ts b/bin/commands/init/certificate/index.ts index aca6f0c4fa..95ecde1729 100644 --- a/bin/commands/init/certificate/index.ts +++ b/bin/commands/init/certificate/index.ts @@ -133,8 +133,6 @@ export function execute() { let verifyCertificates = zoweConfig.zowe.verifyCertificates ? zoweConfig.zowe.verifyCertificates.toUpperCase() : undefined; if (verifyCertificates == "STRICT" || verifyCertificates == "NONSTRICT") { CERT_PARMS.keyring_trust_zosmf="--trust-zosmf"; - CERT_PARMS.zosmf_host = std.getenv('zosmf_host'); - CERT_PARMS.zosmf_port = std.getenv('zosmf_port'); } else { delete CERT_PARMS.zosmf_host; delete CERT_PARMS.zosmf_port; @@ -154,10 +152,10 @@ export function execute() { } if (certType == "PKCS12") { if (!CERT_PARMS.pkcs12_caAlias) { - CERT_PARMS.pkcs12_caAlias='localCa'; + CERT_PARMS.pkcs12_caAlias='local_ca'; } if (!CERT_PARMS.pkcs12_caPassword) { - CERT_PARMS.pkcs12_caPassword='localCaPassword'; + CERT_PARMS.pkcs12_caPassword='local_ca_password'; } if (!CERT_PARMS.pkcs12_name) { CERT_PARMS.pkcs12_name='localhost'; diff --git a/playbooks/roles/start/defaults/main.yml b/playbooks/roles/start/defaults/main.yml index b1a964bc85..93edfd3502 100644 --- a/playbooks/roles/start/defaults/main.yml +++ b/playbooks/roles/start/defaults/main.yml @@ -2,8 +2,8 @@ # ============================================================================== # Constants # ============================================================================== -# 240 * 10 seconds = 40 mins -wait_for_zowe_service_retries: 240 +# 150 * 10 seconds = 25 mins +wait_for_zowe_service_retries: 150 # Every 10 seconds wait_for_zowe_service_delay: 10