Merge "[DCAEMOD] Uses new tpls for repos / images"

[oom.git] / kubernetes / so / components / so-etsi-nfvo-ns-lcm / values.yaml

diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
index 82ba084..f5ad18f 100644 (file)
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
@@ -17,10 +17,6 @@
 #################################################################
 global:
   nodePortPrefixExt: 304
-  repository: nexus3.onap.org:10001
-  readinessImage: onap/oom/readiness:3.0.1
-  aafAgentImage: onap/aaf/aaf_agent:2.1.20
-  envsubstImage: dibi/envsubst
   persistence:
     mountPath: /dockerdata-nfs
   security:
@@ -59,7 +55,6 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-repository: nexus3.onap.org:10001
 image: onap/so/so-etsi-nfvo-ns-lcm:1.7.7
 pullPolicy: Always
 
@@ -94,13 +89,13 @@ service:
   annotations:
     service.alpha.kubernetes.io/tolerate-unready-endpoints: 'true'
     msb.onap.org/service-info: |
-      {{ if not .Values.global.msbDisabled -}}[
+      {{ if .Values.global.msbEnabled -}}[
         {
           "serviceName": "{{ include "common.servicename" . }}",
           "version": "v1",
           "url": "/so/so-etsi-nfvo-ns-lcm/v1",
           "protocol": "REST",
-          "port": "{{ include "common.getPort" (dict "global" . "name" "nfvo-nslcm-port") }}",
+          "port": "{{ include "common.getPort" (dict "global" . "name" "http-api") }}",
           "visualRange":"1"
         }
       ]{{ end }}