Merge "[AAI] Make aai log level configurable"

[oom.git] / kubernetes / so / components / soHelpers / values.yaml

diff --git a/kubernetes/so/components/soHelpers/values.yaml b/kubernetes/so/components/soHelpers/values.yaml
index 3919381..ec3fef2 100755 (executable)
--- a/kubernetes/so/components/soHelpers/values.yaml
+++ b/kubernetes/so/components/soHelpers/values.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2018 AT&T USA
 # Copyright © 2020 Huawei
+# Copyright © 2021 Orange
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,61 +16,9 @@
 # Global configuration defaults.
 #################################################################
 global:
-  soBaseImage: onap/so/base-image:1.0
-  aafAgentImage: onap/aaf/aaf_agent:2.1.20
   msbEnabled: true
-  security:
-    aaf:
-      enabled: false
   app:
     msoKey: 07a7159d3bf51a0e53be7a8f89699be7
-  client:
-    certs:
-      truststore: /app/client/org.onap.so.trust.jks
-      keystore: /app/client/org.onap.so.jks
-      trustStorePassword: LHN4Iy5DKlcpXXdWZ0pDNmNjRkhJIzpI
-      keyStorePassword: c280b25hcA==
-  certificates:
-    path: /etc/ssl/certs
-    share_path: /usr/local/share/ca-certificates/
-
-#################################################################
-# Secrets metaconfig
-#################################################################
-secrets:
-  - uid: 'so-onap-certs'
-    name: '{{ include "common.release" . }}-so-certs'
-    externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
-    type: generic
-    filePaths:
-      - resources/config/certificates/msb-ca.crt
-
-#################################################################
-# AAF part
-#################################################################
-certInitializer:
-  aafDeployFqi: deployer@people.osaaf.org
-  aafDeployPass: demo123456!
-  # aafDeployCredsExternalSecret: some secret
-  fqdn: so
-  fqi: so@so.onap.org
-  public_fqdn: so.onap.org
-  cadi_longitude: '0.0'
-  cadi_latitude: '0.0'
-  app_ns: org.osaaf.aaf
-  credsPath: /opt/app/osaaf/local
-  trustStoreAllPass: changeit
-  aaf_add_config: >
-    /opt/app/aaf_config/bin/agent.sh local showpass
-    {{.Values.fqi}} {{ .Values.fqdn }} > {{ .Values.credsPath }}/mycreds.prop
-
-aafConfig:
-  permission_user: 1000
-  permission_group: 999
-
-aaf:
-  trustore: org.onap.so.trust.jks
-  keyFile: org.onap.so.keyfile
 
 #################################################################
 # Application configuration defaults.
@@ -83,17 +32,3 @@ livenessProbe:
   timeoutSeconds: 10
   successThreshold: 1
   failureThreshold: 3
-
-cadi:
-  logLevel: DEBUG
-  latitude: 38.4329
-  longitude: -90.43248
-  aafEnv: IST
-  aafApiVersion: 2.1
-  aafRootNs: org.onap.so
-  aafLocateUrl: https://aaf-locate.onap:8095
-  aafUrl: https://aaf-locate.onap:8095/locate/org.osaaf.aaf.service:2.1
-  aafId: so@so.onap.org
-  aafPassword: enc:EME-arXn2lx8PO0f2kEtyK7VVGtAGWavXorFoxRmPO9
-  apiEnforcement: org.onap.so.apihPerm
-  noAuthn: /manage/health