X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fmulticloud%2Fvalues.yaml;h=bff78cafc949f77b395da72f00bace153e844687;hb=718fb74a15842d2bf178d3ad44a5d73d2986433b;hp=889c06bd4759c333e8b348351234ec1bf11d660f;hpb=3790a7acab344b65ce0133f3dd7f0a85cd43201d;p=oom.git

diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml
index 889c06bd47..0f5ede8ad0 100644
--- a/kubernetes/multicloud/values.yaml
+++ b/kubernetes/multicloud/values.yaml
@@ -18,31 +18,50 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
-  artifactImage: onap/multicloud/framework-artifactbroker:1.3.1
+  artifactImage: onap/multicloud/framework-artifactbroker:1.9.0
   prometheus:
     enabled: false
+  persistence: {}
+  centralizedLoggingEnabled: true
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-repository: nexus3.onap.org:10001
-image: onap/multicloud/framework:1.3.1
+image: onap/multicloud/framework:1.8.1
 pullPolicy: Always
 
 #Istio sidecar injection policy
 istioSidecar: true
 
+multicloud-fcaps:
+  enabled: true
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
+multicloud-k8s:
+  enabled: true
+multicloud-pike:
+  enabled: true
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
+multicloud-prometheus:
+  enabled: false
+multicloud-starlingx:
+  enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
+multicloud-vio:
+  enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
+multicloud-windriver:
+  enabled: false
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-multicloud'
+
 # application configuration
 config:
   msbgateway: msb-iag
-  msbPort: 80
   logstashServiceName: log-ls
   logstashPort: 5044
+  msbPort: 80
   aai:
-    port: 8443
+    aaiPort: 80
     schemaVersion: v13
     username: AAI
     password: AAI
@@ -65,14 +84,40 @@ liveness:
 
 service:
   type: NodePort
-  name: multicloud
-  portName: multicloud-framework
-  externalPort: 9001
   internalPort: 9001
-  nodePort: 91
+  ports:
+    - name: http
+      port: 9001
+      nodePort: '91'
+  annotations:
+    msb.onap.org/service-info: |
+      {{ if .Values.global.msbEnabled -}}[
+        {
+          "serviceName": "multicloud",
+          "version": "v0",
+          "url": "/api/multicloud/v0",
+          "protocol": "REST",
+          "port": "{{ .Values.service.internalPort }}",
+          "enable_ssl": false,
+          "visualRange": "1"
+        },
+        {
+          "serviceName": "multicloud",
+          "version": "v1",
+          "url": "/api/multicloud/v1",
+          "protocol": "REST",
+          "port": "{{ .Values.service.internalPort }}",
+          "enable_ssl": false,
+          "visualRange": "1"
+        }
+      ]{{ end }}
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: 'multicloud-api'
+      name: 'multicloud'
+      port: 9001
 
 # Resource Limit flavor -By Default using small
 flavor: small
@@ -93,3 +138,13 @@ resources:
       cpu: 20m
       memory: 2Gi
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: multicloud
+  roles:
+    - read
+
+#Log configuration
+log:
+  path: /var/log/onap