From eac5450b4aac7a669e855db8657a486ff1d04cd9 Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Fri, 9 Feb 2024 00:49:46 -0500 Subject: [PATCH 1/3] Get correct host name when using dvipa Signed-off-by: Timothy Gerstel --- defaults/serverConfig/defaults.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/defaults/serverConfig/defaults.yaml b/defaults/serverConfig/defaults.yaml index 53969ee..53c68a6 100644 --- a/defaults/serverConfig/defaults.yaml +++ b/defaults/serverConfig/defaults.yaml @@ -106,7 +106,9 @@ components: hostname: '${{ function a() { if (process.env.ZWE_RUN_IN_CONTAINER=="true" && process.env.ZWE_GATEWAY_HOST) { return process.env.ZWE_GATEWAY_HOST; - } else { + } else if (zowe.network?.server?.dvipa?.enabled=="true") { + return zowe.network.server.dvipa.vipa; + } else { return zowe.externalDomains[0] } }; a() }}' discoveryUrls: '${{ function a() { From 2e29b99656b38ab92def55497d758f62904adcb3 Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Mon, 12 Feb 2024 10:04:17 -0500 Subject: [PATCH 2/3] If gateway has its own DVIPA, prefer that Signed-off-by: Timothy Gerstel --- defaults/serverConfig/defaults.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/defaults/serverConfig/defaults.yaml b/defaults/serverConfig/defaults.yaml index 53c68a6..5f75f5d 100644 --- a/defaults/serverConfig/defaults.yaml +++ b/defaults/serverConfig/defaults.yaml @@ -107,7 +107,11 @@ components: if (process.env.ZWE_RUN_IN_CONTAINER=="true" && process.env.ZWE_GATEWAY_HOST) { return process.env.ZWE_GATEWAY_HOST; } else if (zowe.network?.server?.dvipa?.enabled=="true") { - return zowe.network.server.dvipa.vipa; + if(components["gateway"].zowe?.network?.server?.dvipa?.vipa){ + return components["gateway"].zowe?.network?.server?.dvipa?.vipa + } else { + return zowe.network.server.dvipa.vipa; + } } else { return zowe.externalDomains[0] } }; a() }}' From c9cc81629b6fb59666f25b09f47236710b4a2d47 Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Mon, 12 Feb 2024 16:13:04 -0500 Subject: [PATCH 3/3] Stricter condition for using component vipa address Signed-off-by: Timothy Gerstel --- defaults/serverConfig/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/serverConfig/defaults.yaml b/defaults/serverConfig/defaults.yaml index 5f75f5d..8dc19b5 100644 --- a/defaults/serverConfig/defaults.yaml +++ b/defaults/serverConfig/defaults.yaml @@ -107,7 +107,7 @@ components: if (process.env.ZWE_RUN_IN_CONTAINER=="true" && process.env.ZWE_GATEWAY_HOST) { return process.env.ZWE_GATEWAY_HOST; } else if (zowe.network?.server?.dvipa?.enabled=="true") { - if(components["gateway"].zowe?.network?.server?.dvipa?.vipa){ + if(components["gateway"].zowe?.network?.server?.dvipa?.enabled=="true" && components["gateway"].zowe?.network?.server?.dvipa?.vipa){ return components["gateway"].zowe?.network?.server?.dvipa?.vipa } else { return zowe.network.server.dvipa.vipa;