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 | b69313bdf730f1edb654e5a048a6b9e78a0cc5cc (patch) | |
| tree | ac33688ea73fbbc4614b9afb33397a08c47527c0 /kubernetes/aai/charts | |
| parent | 450e363b6573d3b6d8b3ad19dc592d304284ee54 (diff) | |
| parent | 8e7cbd2e928e2bb8c5958e1ceeb52280cd8b319d (diff) | |
Merge "Update log path to get filebeat working"
Diffstat (limited to 'kubernetes/aai/charts')
3 files changed, 6 insertions, 4 deletions
diff --git a/kubernetes/aai/charts/aai-cassandra/templates/volumes.yaml b/kubernetes/aai/charts/aai-cassandra/templates/volumes.yaml index 0e1a3dfc26..f45a4504b3 100644 --- a/kubernetes/aai/charts/aai-cassandra/templates/volumes.yaml +++ b/kubernetes/aai/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/kubernetes/aai/charts/aai-resources/templates/deployment.yaml b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml index 72c7bc0379..bc0f1712b6 100644 --- a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml +++ b/kubernetes/aai/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/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml b/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml index b1b6f74d3f..3bc349f875 100644 --- a/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml +++ b/kubernetes/aai/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 |