Skip to content

[WIP] ZSS startup script to use HA-overriden config for that HA instance #826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Gautham-coder wants to merge 1 commit into
base: v3.x/staging
Choose a base branch
from
+14 −3
Draft

[WIP] ZSS startup script to use HA-overriden config for that HA instance #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

All notable changes to the ZSS package will be documented in this file.

## `3.6.0`
- Enhancement: When running in HA mode, ZSS now uses the per-HA-instance merged YAML config file(e.g. `.zowe-lpar1-merged.yaml`) exposed via `ZWE_PRIVATE_HA_INSTANCE_CONFIG` (written by `zwe internal start prepare`) instead of the global `ZWE_CLI_PARAMETER_CONFIG`. (https://github.com/zowe/zss/pull/826)

## `3.5.0`
- Enhancement: Utility "detect-attls-port" can be used to check if an ATTLS policy exists at a specific connection. (https://github.com/zowe/zss/pull/813)
- Enhancement: ZSS now supports a dedicated client certificate for outbound TLS connections. When `zowe.certificate.keystore.clientCertificateAlias` is set, that certificate is used for client-side connections (e.g. to the APIML Caching Service and JWK endpoint) while the existing `zowe.certificate.keystore.alias` continues to be used as the server certificate. When `clientCertificateAlias` is absent, the existing single-certificate behaviour is preserved for backward compatibility. [(#820)](https://github.com/zowe/zss/pull/820)
Expand Down
14 changes: 11 additions & 3 deletions bin/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,17 @@ if [[ "${OSNAME}" == "OS/390" ]]; then
echo "ZWE_CLI_PARAMETER_CONFIG is not defined. Rerun script with it defined to a list of paths to zowe.yaml files such as /path/to/zowe.yaml or FILE(/yaml1.yaml):LIB(other.yaml):FILE(/path/to/yaml3.yaml)"
fi

# Take in our defaults
ZWES_CONFIG="FILE(${ZWE_CLI_PARAMETER_CONFIG}):FILE(${ZWES_COMPONENT_HOME}/defaults.yaml)"

# Take in our defaults.
# When running in HA mode, ZWE_PRIVATE_HA_INSTANCE_CONFIG points to a per-instance
# merged YAML that already has the haInstances overrides applied.
# Fall back to ZWE_CLI_PARAMETER_CONFIG (the global merged yaml) for non-HA
# or when the per-instance file has not been written yet.
if [ -n "${ZWE_PRIVATE_HA_INSTANCE_CONFIG}" ]; then
ZWES_CONFIG="FILE(${ZWE_PRIVATE_HA_INSTANCE_CONFIG}):FILE(${ZWES_COMPONENT_HOME}/defaults.yaml)"
else
ZWES_CONFIG="FILE(${ZWE_CLI_PARAMETER_CONFIG}):FILE(${ZWES_COMPONENT_HOME}/defaults.yaml)"
fi

# Essential parameters now set up.

ZSS_SCRIPT_DIR="${ZWES_COMPONENT_HOME}/bin"
Expand Down
Loading