Merge "[CONSUL] Add limits to consul chart."

[oom.git] / kubernetes / so / resources / config / overrides / override.yaml

diff --git a/kubernetes/so/resources/config/overrides/override.yaml b/kubernetes/so/resources/config/overrides/override.yaml
index 99c76cd..efcf029 100755 (executable)
--- a/kubernetes/so/resources/config/overrides/override.yaml
+++ b/kubernetes/so/resources/config/overrides/override.yaml
@@ -1,24 +1,28 @@
+aai:
+  endpoint: https://aai.{{ include "common.namespace" . }}:8443
+  auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.aai.auth )}}
 server:
-    port: 8080
+    port: {{ index .Values.containerPort }}
     tomcat:
         max-threads: 50
 ssl-enable: false
 mso:
-  msoKey: "07a7159d3bf51a0e53be7a8f89699be7"
-  logPath: logs
-  site-name: onapheat
+  msoKey: {{ .Values.global.app.msoKey }}
+  logPath: ./logs/apih
+  site-name: {{ index .Values.global.app.siteName }}
   adapters:
     requestDb:
-      endpoint: http://c1.vm1.mso.simpledemo.onap.org:8083
-      auth: YnBlbDptc28tZGItMTUwNyE=
+      endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
+      auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.adapters.requestDb.auth )}}
   catalog:
     db:
       spring:
-        endpoint: "http://c1.vm1.mso.simpledemo.onap.org:8082"
+        endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
   db:
-    auth: Basic cGFzc3dvcmQxJA==
+    auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.adapters.requestDb.auth )}}
   config:
     path: /src/main/resources/
+    cadi: {{ include "so.cadi.keys" . | nindent 10}}
   infra:
     default:
       alacarte:
@@ -29,59 +33,54 @@ mso:
         macro:
           default:
             testApi: GR_API
-  apih:
-    homing:
-      sdna:
-        url: http://c1.vm1.mso.simpledemo.onap.org:8086/
-        password: 4112B789E942B161228F7D5AFC654C0F
-  bpelURL: http://c1.vm1.mso.simpledemo.onap.org:8082/
-  bpelAuth: 786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1
-  camundaURL: http://c1.vm1.mso.simpledemo.onap.org:8082/
-  camundaAuth: 5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1
+  camundaURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/
+  camundaAuth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.camundaAuth )}}
   async:
     core-pool-size: 50
     max-pool-size: 50
     queue-capacity: 500
   sdc:
     client:
-      auth: F3473596C526938329DF877495B494DC374D1C4198ED3AD305EA3ADCBBDA1862
+      auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.sdc.client.auth )}}
     activate:
       instanceid: test
       userid: cs0008
-    endpoint: http://c1.vm1.mso.simpledemo.onap.org:28090
+    endpoint: http://sdc-be.{{ include "common.namespace" . }}:8443
   tenant:
     isolation:
       retry:
         count: 3
   aai:
-    endpoint: https://aai.api.simpledemo.onap.org:8443
-    auth: 2630606608347B7124C244AB0FE34F6F
+    endpoint: https://aai.{{ include "common.namespace" . }}:8443
+    auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.aai.auth )}}
+
+  extApi:
+    endpoint: http://nbi.onap:8080/nbi/api/v3
   so:
     operational-environment:
       dmaap:
         username: testuser
         password: VjR5NDcxSzA=
-        host: http://c1.vm1.mso.simpledemo.onap.org:28090
+        host: http://dmaap-bc.{{ include "common.namespace" . }}:8080
+        auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.so.operationalEnv.dmaap.auth )}}
       publisher:
         topic: com.att.ecomp.mso.operationalEnvironmentEvent
+  health:
+    auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.health.auth )}}
+    endpoints:
+      - subsystem: apih
+        uri: http://so-bpmn-infra:8081
+      - subsystem: catalogdb
+        uri: http://so-catalog-db-adapter:8082
 spring:
   datasource:
-    url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
-    username: ${DB_USERNAME}
-    password: ${DB_PASSWORD}
-    driver-class-name: org.mariadb.jdbc.Driver
-    dbcp2:
-      initial-size: 5
-      max-total: 20
-      validation-query: select 1
-      test-on-borrow: true
-  jpa:
-      show-sql: true
-      hibernate:
-        dialect: org.hibernate.dialect.MySQL5Dialect
-        ddl-auto: validate
-        naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
-        enable-lazy-load-no-trans: true
+    hikari:
+      jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/catalogdb
+      username: ${DB_USERNAME}
+      password: ${DB_PASSWORD}
+      driver-class-name: org.mariadb.jdbc.Driver
+      pool-name: catdb-pool
+      registerMbeans: true
   jersey:
     type: filter
   security:
@@ -112,12 +111,17 @@ spring:
       role: ACTUATOR
 request:
   datasource:
-    url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
-    username: ${DB_USERNAME}
-    password: ${DB_PASSWORD}
-    driver-class-name: org.mariadb.jdbc.Driver
-    dbcp2:
-      initial-size: 5
-      max-total: 20
-      validation-query: select 1
-      test-on-borrow: true
\ No newline at end of file
+    hikari:
+      jdbcUrl: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb
+      username: ${DB_USERNAME}
+      password: ${DB_PASSWORD}
+      driver-class-name: org.mariadb.jdbc.Driver
+      pool-name: reqdb-pool
+      registerMbeans: true
+org:
+  onap:
+    so:
+      cloud-owner: CloudOwner
+      adapters:
+        network:
+          encryptionKey: {{ .Values.global.app.msoKey }}