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
This commit is contained in:
parent
3692900359
commit
94997223b6
|
@ -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}
|
||||
|
||||
|
|
|
@ -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'}
|
||||
|
||||
|
|
|
@ -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'}
|
||||
|
||||
|
|
|
@ -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'}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue