diff options
| author |   Fiachra Corcoran <fiachra.corcoran@est.tech> | 2022-10-20 12:24:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-10-20 12:24:08 +0000 |
| commit | 9f8320c7888b43b667eea20c251f0806e6f6990a (patch) | |
| tree | f19f6d2d2069e971fbce90360750b20d67635e20 | |
| parent | b157876e5924fb2b6d3c1b977936227857172909 (diff) | |
| parent | cb947b512b1bf06890752fe35398de74a9258efe (diff) | |
Merge "[ROBOT] Get VES collector tests work under ServiceMesh"
| -rw-r--r-- | kubernetes/robot/resources/config/eteshare/config/robot_properties.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kubernetes/robot/resources/config/eteshare/config/robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/robot_properties.py index e9da3ffaa8..8365c68297 100644 --- a/kubernetes/robot/resources/config/eteshare/config/robot_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/robot_properties.py @@ -355,8 +355,8 @@ GLOBAL_VNFSDK_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "host GLOBAL_DCAE_VES_PROTOCOL = "http" GLOBAL_DCAE_VES_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dcae-ves-collector" "port" 8080) }}' -GLOBAL_DCAE_VES_HTTPS_PROTOCOL = "https" -GLOBAL_DCAE_VES_HTTPS_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dcae-ves-collector-https" "port" 8443) }}' +GLOBAL_DCAE_VES_HTTPS_PROTOCOL = 'http{{ (eq "true" (include "common.needTLS" .)) | ternary "s" "" }}' +GLOBAL_DCAE_VES_HTTPS_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dcae-ves-collector-https" "port" ( ternary 8443 8080 (eq "true" (include "common.needTLS" . )))) }}' GLOBAL_DCAE_VES_USERNAME = 'sample1' GLOBAL_DCAE_VES_PASSWORD = 'sample1' |