From 94997223b6173be29fb621d827f8a7ecfa4b6bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Tue, 18 Aug 2020 11:36:20 +0200 Subject: [PATCH] Fix endpoint map tls - zaqar wss port We open port: `` 3000 #SSL for websocket`` in the zaqar service defenition: deployment/zaqar/zaqar-container-puppet.yaml:L130 But SSL environment files use port 9000 for the public endpoint. Using 9000 also for SSL can cause issues in haproxy. We may want to revert or relax the check in https://review.opendev.org/664224 as duplicate IP's is'nt the actual problem. Related-Bug: #1832168 Related-RHBZ: #1868910 Change-Id: I05f31885ade46d47ff5d384dabbd5561f4df9278 --- environments/ssl/no-tls-endpoints-public-ip.yaml | 1 + environments/ssl/tls-endpoints-public-dns.yaml | 3 ++- environments/ssl/tls-endpoints-public-ip.yaml | 3 ++- environments/ssl/tls-everywhere-endpoints-dns.yaml | 3 ++- sample-env-generator/ssl.yaml | 6 +++--- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/environments/ssl/no-tls-endpoints-public-ip.yaml b/environments/ssl/no-tls-endpoints-public-ip.yaml index b8e699ef0d..8de6e5de00 100644 --- a/environments/ssl/no-tls-endpoints-public-ip.yaml +++ b/environments/ssl/no-tls-endpoints-public-ip.yaml @@ -104,3 +104,4 @@ parameter_defaults: ZaqarWebSocketInternal: {protocol: ws, port: '9000', host: IP_ADDRESS} ZaqarWebSocketPublic: {protocol: ws, port: '9000', host: IP_ADDRESS} ZaqarWebSocketUIConfig: {protocol: ws, port: '3000', host: IP_ADDRESS} + diff --git a/environments/ssl/tls-endpoints-public-dns.yaml b/environments/ssl/tls-endpoints-public-dns.yaml index 030d63d92e..ba59324067 100644 --- a/environments/ssl/tls-endpoints-public-dns.yaml +++ b/environments/ssl/tls-endpoints-public-dns.yaml @@ -98,5 +98,6 @@ parameter_defaults: ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'} ZaqarWebSocketAdmin: {protocol: 'ws', port: '9000', host: 'IP_ADDRESS'} ZaqarWebSocketInternal: {protocol: 'ws', port: '9000', host: 'IP_ADDRESS'} - ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'} + ZaqarWebSocketPublic: {protocol: 'wss', port: '3000', host: 'CLOUDNAME'} ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'IP_ADDRESS'} + diff --git a/environments/ssl/tls-endpoints-public-ip.yaml b/environments/ssl/tls-endpoints-public-ip.yaml index 945b375789..a116854275 100644 --- a/environments/ssl/tls-endpoints-public-ip.yaml +++ b/environments/ssl/tls-endpoints-public-ip.yaml @@ -98,5 +98,6 @@ parameter_defaults: ZaqarPublic: {protocol: 'https', port: '13888', host: 'IP_ADDRESS'} ZaqarWebSocketAdmin: {protocol: 'ws', port: '9000', host: 'IP_ADDRESS'} ZaqarWebSocketInternal: {protocol: 'ws', port: '9000', host: 'IP_ADDRESS'} - ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'IP_ADDRESS'} + ZaqarWebSocketPublic: {protocol: 'wss', port: '3000', host: 'IP_ADDRESS'} ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'IP_ADDRESS'} + diff --git a/environments/ssl/tls-everywhere-endpoints-dns.yaml b/environments/ssl/tls-everywhere-endpoints-dns.yaml index 1786948c2f..2b0f75d84e 100644 --- a/environments/ssl/tls-everywhere-endpoints-dns.yaml +++ b/environments/ssl/tls-everywhere-endpoints-dns.yaml @@ -98,5 +98,6 @@ parameter_defaults: ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'} ZaqarWebSocketAdmin: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'} ZaqarWebSocketInternal: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'} - ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'} + ZaqarWebSocketPublic: {protocol: 'wss', port: '3000', host: 'CLOUDNAME'} ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'CLOUDNAME'} + diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml index 364c31e934..90660a8ae9 100644 --- a/sample-env-generator/ssl.yaml +++ b/sample-env-generator/ssl.yaml @@ -212,7 +212,7 @@ environments: ZaqarPublic: {protocol: 'https', port: '13888', host: 'IP_ADDRESS'} ZaqarWebSocketAdmin: {protocol: 'ws', port: '9000', host: 'IP_ADDRESS'} ZaqarWebSocketInternal: {protocol: 'ws', port: '9000', host: 'IP_ADDRESS'} - ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'IP_ADDRESS'} + ZaqarWebSocketPublic: {protocol: 'wss', port: '3000', host: 'IP_ADDRESS'} ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'IP_ADDRESS'} - name: ssl/tls-endpoints-public-dns @@ -318,7 +318,7 @@ environments: ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'} ZaqarWebSocketAdmin: {protocol: 'ws', port: '9000', host: 'IP_ADDRESS'} ZaqarWebSocketInternal: {protocol: 'ws', port: '9000', host: 'IP_ADDRESS'} - ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'} + ZaqarWebSocketPublic: {protocol: 'wss', port: '3000', host: 'CLOUDNAME'} ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'IP_ADDRESS'} - name: ssl/tls-everywhere-endpoints-dns @@ -424,7 +424,7 @@ environments: ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'} ZaqarWebSocketAdmin: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'} ZaqarWebSocketInternal: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'} - ZaqarWebSocketPublic: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'} + ZaqarWebSocketPublic: {protocol: 'wss', port: '3000', host: 'CLOUDNAME'} ZaqarWebSocketUIConfig: {protocol: 'wss', port: '443', host: 'CLOUDNAME'} - name: ssl/no-tls-endpoints-public-ip