From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Mon, 17 Feb 2020 07:47:56 +0000 (+0000)
Subject: Merge "[VID] Don't hardcode mariadb-galera password"
X-Git-Tag: 6.0.0~386
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4eddfbdf9caabe3ce30937d78b1bfe8aad72f8f9;hp=4a4703b68172a3d24b47d1510b0c7707805cc6a4;p=oom.git

Merge "[VID] Don't hardcode mariadb-galera password"
---

diff --git a/INFO.yaml b/INFO.yaml
index 33cae2aaf1..06cad4718e 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -78,10 +78,15 @@ committers:
       company: 'Orange'
       id: 'sdesbure'
       timezone: 'Paris/France'
+    - name: 'Krzysztof Opasiak'
+      email: 'k.opasiak@samsung.com'
+      company: 'Samsung'
+      id: 'kopasiak'
+      timezone: 'Poland/Warsaw'
 tsc:
     approval: 'https://lists.onap.org/pipermail/onap-tsc'
     changes:
         - type: 'Addition'
           name: 'Brian Freeman'
           name: 'Yang Xu'
-          link: 'TBD'
\ No newline at end of file
+          link: 'TBD'
diff --git a/kubernetes/aaf/charts/aaf-cm/values.yaml b/kubernetes/aaf/charts/aaf-cm/values.yaml
index 2bd05d81ed..4078fb3c22 100644
--- a/kubernetes/aaf/charts/aaf-cm/values.yaml
+++ b/kubernetes/aaf/charts/aaf-cm/values.yaml
@@ -63,7 +63,7 @@ ingress:
 resources:
  small:
    limits:
-     cpu: 20m
+     cpu: 400m
      memory: 300Mi
    requests:
      cpu: 1m
diff --git a/kubernetes/aaf/charts/aaf-locate/values.yaml b/kubernetes/aaf/charts/aaf-locate/values.yaml
index ce59d2dec9..74638d17a8 100644
--- a/kubernetes/aaf/charts/aaf-locate/values.yaml
+++ b/kubernetes/aaf/charts/aaf-locate/values.yaml
@@ -63,7 +63,7 @@ ingress:
 resources:
  small:
    limits:
-     cpu: 40m
+     cpu: 100m
      memory: 320Mi
    requests:
      cpu: 1m
diff --git a/kubernetes/aaf/charts/aaf-sms/values.yaml b/kubernetes/aaf/charts/aaf-sms/values.yaml
index 2de7466209..41bde75677 100644
--- a/kubernetes/aaf/charts/aaf-sms/values.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/values.yaml
@@ -89,9 +89,9 @@ resources:
   small:
     limits:
       cpu: 100m
-      memory: 15Mi
+      memory: 30Mi
     requests:
-      cpu: 10m
+      cpu: 25m
       memory: 10Mi
   large:
     limits: