Ceph: Update log directory host mount path

This updates the ceph-mon and ceph-osd charts to use the release
name for the hostpath defined for mounting the /var/log/ceph
directories to. This gives us a mechanism for creating unique log
directories for multiple releases of the same chart without the
need for specifying an override for each deployment of that chart

Change-Id: Ie6e05b99c32f24440fbade02d59c7bb14d8aa4c8
This commit is contained in:
Steve Wilkerson 2018-10-29 13:05:46 -05:00
parent 6ef48d3706
commit 45da8c2b69
4 changed files with 2 additions and 4 deletions

View File

@ -218,7 +218,7 @@ spec:
volumes: volumes:
- name: pod-var-log - name: pod-var-log
hostPath: hostPath:
path: {{ .Values.conf.storage.mon.log_directory }} path: {{ print "/var/log/ceph/" $envAll.Release.Name }}
- name: ceph-mon-bin - name: ceph-mon-bin
configMap: configMap:
name: ceph-mon-bin name: ceph-mon-bin

View File

@ -182,7 +182,6 @@ conf:
storage: storage:
mon: mon:
directory: /var/lib/openstack-helm/ceph/mon directory: /var/lib/openstack-helm/ceph/mon
log_directory: /var/log/ceph
dependencies: dependencies:
dynamic: dynamic:

View File

@ -261,7 +261,7 @@ spec:
emptyDir: {} emptyDir: {}
- name: pod-var-log - name: pod-var-log
hostPath: hostPath:
path: {{ .Values.conf.storage.osd_log_directory }} path: {{ print "/var/log/ceph/" $envAll.Release.Name }}
- name: pod-run - name: pod-run
emptyDir: emptyDir:
medium: "Memory" medium: "Memory"

View File

@ -107,7 +107,6 @@ conf:
osd_mount_options_xfs: "rw,noatime,largeio,inode64,swalloc,logbufs=8,logbsize=256k,allocsize=4M" osd_mount_options_xfs: "rw,noatime,largeio,inode64,swalloc,logbufs=8,logbsize=256k,allocsize=4M"
storage: storage:
osd_log_directory: /var/log/ceph
# NOTE(portdirect): for homogeneous clusters the `osd` key can be used to # NOTE(portdirect): for homogeneous clusters the `osd` key can be used to
# define OSD pods that will be deployed across the cluster. # define OSD pods that will be deployed across the cluster.
osd: osd: