commit f434c1e342c6f3e88a81d20bc51d52379fc5a3e0
author Alexis de Talhouët <alexis.de_talhouet@bell.ca> Thu Sep 20 13:41:12 2018 +0000
committer Gerrit Code Review <gerrit@onap.org> Thu Sep 20 13:41:12 2018 +0000
tree 8c3f22a03fd46b1fc3bfe84f66909c6c36227444
parent b9808c21a4a8bafbbc83bd9d5b1e4e78f4d39174
parent 2309da85645a2a17196978bfd87ffb2ec8339213

Merge "updating gerritBranch to master"

charts/aai-modelloader/resources/config/model-loader.properties

diff --git a/charts/aai-modelloader/resources/config/model-loader.properties b/charts/aai-modelloader/resources/config/model-loader.properties
index bebf7d8..246e528 100644
--- a/charts/aai-modelloader/resources/config/model-loader.properties
+++ b/charts/aai-modelloader/resources/config/model-loader.properties
@@ -41,8 +41,6 @@
 ml.babel.BASE_URL=https://aai-babel.{{.Release.Namespace}}:9516
 ml.babel.GENERATE_ARTIFACTS_URL=/services/babel-service/v1/app/generateArtifacts
 ml.babel.KEYSTORE_FILE=babel-client-cert.p12
-ml.babel.TRUSTSTORE_FILE=babel-client-cert.p12
-ml.babel.TRUSTSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
 ml.babel.KEYSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
 ml.babel.TRUSTSTORE_FILE=tomcat_keystore
 ml.babel.TRUSTSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10

values.yaml

diff --git a/values.yaml b/values.yaml
index 25f8ddf..2345b3f 100644
--- a/values.yaml
+++ b/values.yaml
@@ -258,12 +258,12 @@
       cpu: 2
       memory: 4Gi
     requests:
-      cpu: 2
-      memory: 4Gi
+      cpu: 1
+      memory: 1Gi
   large:
     limits:
       cpu: 4
       memory: 8Gi
     requests:
-      cpu: 4
-      memory: 8Gi
+      cpu: 2
+      memory: 2Gi