X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fholmes%2Fcomponents%2Fholmes-engine-mgmt%2Fvalues.yaml;h=bd06bcd1eeeba65ebbed355da2e92b92dfc99040;hb=refs%2Fheads%2Fmaster;hp=f44faa10597826487db8429f4d31ca8b7044016c;hpb=a3854762a4d22de46cb56c52a5d9c401dfad6680;p=oom.git

diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
index f44faa1059..bd06bcd1ee 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
@@ -20,47 +20,19 @@
 #################################################################
 global:
   nodePortPrefixExt: 302
+  msbProtocol: http
+  msbServiceName: msb-iag
+  msbPort: 80
+  postgres:
+    localCluster: false
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/holmes/engine-management:1.3.3
+image: onap/holmes/engine-management:12.0.1
 consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.0.0
 
-#################################################################
-# AAF part
-#################################################################
-certInitializer:
-  nameOverride: holmes-engine-mgmt-cert-initializer
-  aafDeployFqi: deployer@people.osaaf.org
-  aafDeployPass: demo123456!
-  # aafDeployCredsExternalSecret: some secret
-  fqdn: holmes-engine-mgmt
-  fqi: holmes-engine-mgmt@holmes-engine-mgmt.onap.org
-  fqi_namespace: org.onap.holmes-engine-mgmt
-  public_fqdn: holmes-engine-mgmt.onap.org
-  cadi_longitude: "0.0"
-  cadi_latitude: "0.0"
-  app_ns: org.osaaf.aaf
-  credsPath: /opt/app/osaaf/local
-  aaf_add_config: |
-    echo "*** changing them into shell safe ones"
-    export KEYSTORE_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w64 | head -n1)
-    export TRUSTSORE_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w64 | head -n1)
-    cd {{ .Values.credsPath }}
-    keytool -storepasswd -new "${KEYSTORE_PASSWORD}" \
-      -storepass "${cadi_keystore_password_p12}" \
-      -keystore {{ .Values.fqi_namespace }}.p12
-    keytool -storepasswd -new "${TRUSTSORE_PASSWORD}" \
-      -storepass "${cadi_truststore_password}" \
-      -keystore {{ .Values.fqi_namespace }}.trust.jks
-    echo "*** save the generated passwords"
-    echo "KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD}" > mycreds.prop
-    echo "TRUSTSORE_PASSWORD=${TRUSTSORE_PASSWORD}" >> mycreds.prop
-    echo "*** change ownership of certificates to targeted user"
-    chown -R 1000 .
-
 #################################################################
 # Secrets metaconfig
 #################################################################
@@ -87,20 +59,41 @@ config:
     dbUser: admin
     dbUserPassword: admin
     # dbUserCredsExternalSecret
+  msb:
+    serviceName: msb-iag
+    port: 80
+  aai:
+    aaiPort: 80
+    username: AAI
+    password: AAI
 
 service:
   type: ClusterIP
   name: holmes-engine-mgmt
   ports:
-  - name: https-rest
+  - name: http-rest
     port: &svc_port 9102
+  annotations:
+    msb.onap.org/service-info: |
+      {{ if .Values.global.msbEnabled -}}[
+        {
+          "serviceName": "holmes-engine-mgmt",
+          "version": "v1",
+          "url": "/api/holmes-engine-mgmt/v1",
+          "path":"/api/holmes-engine-mgmt/v1",
+          "protocol": "REST",
+          "visualRange":"0|1",
+          "port": "9102",
+          "enable_ssl": false
+        }
+      ]{{ end }}
 
 # probe configuration parameters
 liveness:
   initialDelaySeconds: 10
   periodSeconds: 10
   path: /api/holmes-engine-mgmt/v1/healthcheck
-  scheme: HTTPS
+  scheme: HTTP
   port: *svc_port
   enabled: true
 
@@ -108,23 +101,37 @@ readiness:
   initialDelaySeconds: 30
   periodSeconds: 30
   path: /api/holmes-engine-mgmt/v1/healthcheck
-  scheme: HTTPS
+  scheme: HTTP
   port: *svc_port
 
 # Segregation for Different environment (Small and Large)
 resources:
   small:
     limits:
-      cpu: 500m
-      memory: 1Gi
+      cpu: "1"
+      memory: "1Gi"
     requests:
-      cpu: 250m
-      memory: 500Mi
+      cpu: "0.5"
+      memory: "1Gi"
   large:
     limits:
-      cpu: 500m
-      memory: 2Gi
+      cpu: "2"
+      memory: "2Gi"
     requests:
-      cpu: 250m
-      memory: 1Gi
+      cpu: "1"
+      memory: "2Gi"
   unlimited: {}
+
+readinessCheck:
+  wait_for_global:
+    jobs:
+      - '{{ include "common.release" . }}-holmes-postgres-init-config-job'
+  wait_for_local:
+    services:
+      - '{{ .Values.global.postgres.service.name2 }}'
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: holmes-engine-mgmt
+  roles:
+    - read