Fix ca name, fix zosmf trust, and shorten retry time to not waste bui…

…ld time on failures Signed-off-by: 1000TurquoisePogs <[email protected]>
zowe · Oct 27, 2023 · 4f35f31 · 4f35f31
1 parent 3762d2e
commit 4f35f31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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