Merge "ceph: make log directory configurable"

ceph-mon/templates/daemonset-mon.yaml

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

ceph-mon/values.yaml

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

ceph-osd/templates/daemonset-osd.yaml

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

ceph-osd/values.yaml

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