Merge pull request #1742 from timgerstel/bugfix/externalCA

Add external CA certs to env file, removed unused var

CHANGELOG.md

@@ -8,6 +8,7 @@ All notable changes to the Zowe Installer will be documented in this file.
 - ZSS can now be started completely independent from the Application Framework server by specifying the LAUNCH_COMPONENT_GROUP "ZSS". If not specified but DESKTOP is, zss will still be included as a prereq to app-server.
 - Zowe Instance Configuration script (zowe-configure-instance.sh) can now skip checking for node by passing in the -s flag since node may not needed if the launch components don't require node
 - run-zowe.sh can also skip the checking for node by settting the environment variable SKIP_NODE=1 for the cases where the launch components specified don't require node
+- Export "EXTERNAL_CERTIFICATE_AUTHORITIES" variable to zowe-certificates.env such that it may be used by the app-server.
 
 ## `1.16.0`
 

bin/zowe-setup-certificates.sh

@@ -298,8 +298,8 @@ if [[ -z "${ZOWE_KEYRING}" ]]; then
     KEYSTORE_CERTIFICATE=${KEYSTORE_PREFIX}.cer-ebcdic
     KEYSTORE_CERTIFICATE_AUTHORITY=${LOCAL_CA_PREFIX}.cer-ebcdic
     EXTERNAL_ROOT_CA=${EXTERNAL_ROOT_CA}
+    EXTERNAL_CERTIFICATE_AUTHORITIES=${EXTERNAL_CERTIFICATE_AUTHORITIES}
     ZOWE_APIM_VERIFY_CERTIFICATES=${VERIFY_CERTIFICATES}
-    SETUP_APIML_SSO=${SETUP_APIML_SSO}
     SSO_FALLBACK_TO_NATIVE_AUTH=${SSO_FALLBACK_TO_NATIVE_AUTH}
     PKCS11_TOKEN_NAME=${PKCS11_TOKEN_NAME}
     PKCS11_TOKEN_LABEL=${UPPER_KEY_LABEL}
@@ -314,8 +314,8 @@ else
     KEYSTORE_TYPE="JCERACFKS"
     TRUSTSTORE="safkeyring:////\${KEYRING_OWNER}/\${KEYRING_NAME}"
     EXTERNAL_ROOT_CA=${EXTERNAL_ROOT_CA}
+    EXTERNAL_CERTIFICATE_AUTHORITIES=${EXTERNAL_CERTIFICATE_AUTHORITIES}
     ZOWE_APIM_VERIFY_CERTIFICATES=${VERIFY_CERTIFICATES}
-    SETUP_APIML_SSO=${SETUP_APIML_SSO}
     SSO_FALLBACK_TO_NATIVE_AUTH=${SSO_FALLBACK_TO_NATIVE_AUTH}
     PKCS11_TOKEN_NAME=${PKCS11_TOKEN_NAME}
     PKCS11_TOKEN_LABEL=${UPPER_KEY_LABEL}