summaryrefslogtreecommitdiffstats
path: root/kubernetes/robot
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-09-14 14:00:16 +0000
committerGerrit Code Review <gerrit@onap.org>2021-09-14 14:00:16 +0000
commitf298897e7e5871bef78ca49b9b4bf9d2b0741658 (patch)
treecaeeb48491a8df75918a0c15c293f58a2a0955ac /kubernetes/robot
parent3188824be7f3ba27c606d93b14e280fe01db9109 (diff)
parent27fd7d8750ceeb798052eb8af36264c79b6536fb (diff)
Merge "[AAI] Service Mesh compatibility"
Diffstat (limited to 'kubernetes/robot')
-rw-r--r--kubernetes/robot/resources/config/eteshare/config/robot_properties.py4
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 39448a72c5..ac663da769 100644
--- a/kubernetes/robot/resources/config/eteshare/config/robot_properties.py
+++ b/kubernetes/robot/resources/config/eteshare/config/robot_properties.py
@@ -128,8 +128,8 @@ GLOBAL_AAF_USERNAME = '{{ .Values.aafUsername }}'
GLOBAL_AAF_PASSWORD = '{{ .Values.aafPassword }}'
GLOBAL_AAF_AUTHENTICATION = [GLOBAL_AAF_USERNAME, GLOBAL_AAF_PASSWORD]
# aai info - everything is from the private oam network (also called onap private network)
-GLOBAL_AAI_SERVER_PROTOCOL = "https"
-GLOBAL_AAI_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "aai" "port" 8443) }}'
+GLOBAL_AAI_SERVER_PROTOCOL = '{{ include "common.scheme" . }}'
+GLOBAL_AAI_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "aai" "port" ( ternary 8443 80 (eq "true" (include "common.needTLS" . )))) }}'
GLOBAL_AAI_USERNAME = '{{ .Values.aaiUsername }}'
GLOBAL_AAI_PASSWORD = '{{ .Values.aaiPassword}}'
GLOBAL_AAI_AUTHENTICATION = [GLOBAL_AAI_USERNAME, GLOBAL_AAI_PASSWORD]