X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fmulticloud%2Ftemplates%2Fservice.yaml;h=1c483b0d2d5099307d184e1fdc893e451d8e5689;hb=dfa23c83cc8630915824968ba7b043ef968e38b6;hp=3f950db0389be72b477a9c46419eac6b55eae363;hpb=a1f85b8cf2438c8096de910687a4621b94df3165;p=oom.git

diff --git a/kubernetes/multicloud/templates/service.yaml b/kubernetes/multicloud/templates/service.yaml
index 3f950db038..1c483b0d2d 100644
--- a/kubernetes/multicloud/templates/service.yaml
+++ b/kubernetes/multicloud/templates/service.yaml
@@ -18,7 +18,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.portName }}
+  name: {{ .Values.service.name }}
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
@@ -33,7 +33,11 @@ metadata:
       "url": "/api/multicloud/v0",
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
+      {{if (include "common.needTLS" .) -}}
       "enable_ssl": {{ .Values.config.ssl_enabled }},
+      {{- else -}}
+      "enable_ssl": false,
+      {{- end}}
       "visualRange": "1"
     },
     {
@@ -42,7 +46,7 @@ metadata:
       "url": "/api/multicloud/v1",
       "protocol": "REST",
       "port": "{{ .Values.service.externalPort }}",
-      "enable_ssl": {{ .Values.config.ssl_enabled }},
+      "enable_ssl": {{ if (include "common.needTLS" .) }}{{ .Values.config.ssl_enabled }}{{ else }}false{{ end }},
       "visualRange": "1"
     }
     ]'