diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2018-05-07 21:16:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-07 21:16:01 +0000 |
| commit | 979c3bf60d799ba00451f57201a94f3c3a7bd29c (patch) | |
| tree | 6c97fcff69a70e8d4bfd07e1d9b741b29793a9a2 | |
| parent | 66fa0dce24f8079477fd9aab20ef4beca72570a0 (diff) | |
| parent | cef6152f5de3ae0bec495e9284faf476cd6cbc06 (diff) | |
Merge "Update log path to get filebeat working"
| -rw-r--r-- | charts/aai-cassandra/templates/volumes.yaml | 4 | ||||
| -rw-r--r-- | charts/aai-resources/templates/deployment.yaml | 3 | ||||
| -rw-r--r-- | charts/aai-traversal/templates/deployment.yaml | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/charts/aai-cassandra/templates/volumes.yaml b/charts/aai-cassandra/templates/volumes.yaml index 0e1a3df..f45a450 100644 --- a/charts/aai-cassandra/templates/volumes.yaml +++ b/charts/aai-cassandra/templates/volumes.yaml @@ -5,7 +5,7 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: {{ $root.Values.service.name }}-{{ $i }} + name: {{ $root.Release.Name }}-{{ $root.Values.service.name }}-{{ $i }} namespace: {{ $root.Release.Namespace }} labels: type: {{ $root.Values.persistence.storageType }} @@ -22,4 +22,4 @@ spec: path: {{ $root.Values.persistence.mountPath }}/{{ $root.Release.Name }}/{{ $root.Values.persistence.mountSubPath }}-{{ $i }} persistentVolumeReclaimPolicy: {{ $root.Values.persistence.volumeReclaimPolicy }} {{ end }} -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/charts/aai-resources/templates/deployment.yaml b/charts/aai-resources/templates/deployment.yaml index 72c7bc0..bc0f171 100644 --- a/charts/aai-resources/templates/deployment.yaml +++ b/charts/aai-resources/templates/deployment.yaml @@ -34,6 +34,7 @@ spec: release: {{ .Release.Name }} name: {{ include "common.name" . }} annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} msb.onap.org/service-info: '[ { "serviceName": "_aai-cloudInfrastructure", @@ -453,7 +454,7 @@ spec: - mountPath: /opt/app/aai-resources/resources/etc/appprops/aaiconfig.properties name: {{ include "common.fullname" . }}-aaiconfig-conf subPath: aaiconfig.properties - - mountPath: /var/log/onap + - mountPath: /opt/aai/logroot/AAI-RES name: {{ include "common.fullname" . }}-logs - mountPath: /opt/app/aai-resources/resources/logback.xml name: {{ include "common.fullname" . }}-log-conf diff --git a/charts/aai-traversal/templates/deployment.yaml b/charts/aai-traversal/templates/deployment.yaml index b1b6f74..3bc349f 100644 --- a/charts/aai-traversal/templates/deployment.yaml +++ b/charts/aai-traversal/templates/deployment.yaml @@ -34,6 +34,7 @@ spec: release: {{ .Release.Name }} name: {{ include "common.name" . }} annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} msb.onap.org/service-info: '[ { "serviceName": "_aai-generic-query", @@ -287,7 +288,7 @@ spec: - mountPath: /opt/app/aai-traversal/resources/etc/appprops/aaiconfig.properties name: {{ include "common.fullname" . }}-aaiconfig-conf subPath: aaiconfig.properties - - mountPath: /var/log/onap + - mountPath: /opt/aai/logroot/AAI-GQ name: {{ include "common.fullname" . }}-logs - mountPath: /opt/app/aai-traversal/resources/logback.xml name: {{ include "common.fullname" . }}-log-conf |