diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-09-19 17:30:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-19 17:30:07 +0000 |
| commit | 5c8e9debd31bdbf352dd5099354bd7c2d0b54b55 (patch) | |
| tree | 721813c28a4bd1cfb82a5d263ff428caa5f0b8b1 | |
| parent | cb34d2f44c5bd9b3b1ebf31bb0731bd5c4e48716 (diff) | |
| parent | 7b1252237a2dfbc7d4fdc0b159ed013a909d8e20 (diff) | |
Merge "Add missing filter-types.properties"
| -rw-r--r-- | kubernetes/aai/charts/aai-babel/templates/deployment.yaml | 5 | ||||
| -rw-r--r-- | kubernetes/aai/charts/aai-modelloader/resources/config/model-loader.properties | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/kubernetes/aai/charts/aai-babel/templates/deployment.yaml b/kubernetes/aai/charts/aai-babel/templates/deployment.yaml index 849e47925f..7778324200 100644 --- a/kubernetes/aai/charts/aai-babel/templates/deployment.yaml +++ b/kubernetes/aai/charts/aai-babel/templates/deployment.yaml @@ -71,6 +71,9 @@ spec: - mountPath: /opt/app/babel/config/artifact-generator.properties name: {{ include "common.fullname" . }}-config subPath: artifact-generator.properties + - mountPath: /opt/app/babel/config/filter-types.properties + name: {{ include "common.fullname" . }}-config + subPath: filter-types.properties - mountPath: /opt/app/babel/config/babel-auth.properties name: {{ include "common.fullname" . }}-config subPath: babel-auth.properties @@ -115,6 +118,8 @@ spec: items: - key: artifact-generator.properties path: artifact-generator.properties + - key: filter-types.properties + path: filter-types.properties - key: babel-auth.properties path: babel-auth.properties - key: logback.xml diff --git a/kubernetes/aai/charts/aai-modelloader/resources/config/model-loader.properties b/kubernetes/aai/charts/aai-modelloader/resources/config/model-loader.properties index 246e52895a..bebf7d8801 100644 --- a/kubernetes/aai/charts/aai-modelloader/resources/config/model-loader.properties +++ b/kubernetes/aai/charts/aai-modelloader/resources/config/model-loader.properties @@ -41,6 +41,8 @@ ml.aai.AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw 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 |