From 45da8c2b69ac5e8b9ec3fd307c199bd7ca936a04 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Mon, 29 Oct 2018 13:05:46 -0500
Subject: [PATCH] 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
---
 ceph-mon/templates/daemonset-mon.yaml | 2 +-
 ceph-mon/values.yaml                  | 1 -
 ceph-osd/templates/daemonset-osd.yaml | 2 +-
 ceph-osd/values.yaml                  | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ceph-mon/templates/daemonset-mon.yaml b/ceph-mon/templates/daemonset-mon.yaml
index 7a240779a..73feeb507 100644
--- a/ceph-mon/templates/daemonset-mon.yaml
+++ b/ceph-mon/templates/daemonset-mon.yaml
@@ -218,7 +218,7 @@ spec:
       volumes:
         - name: pod-var-log
           hostPath:
-            path: {{ .Values.conf.storage.mon.log_directory }}
+            path: {{ print "/var/log/ceph/" $envAll.Release.Name }}
         - name: ceph-mon-bin
           configMap:
             name: ceph-mon-bin
diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml
index 7e92f0983..87c761999 100644
--- a/ceph-mon/values.yaml
+++ b/ceph-mon/values.yaml
@@ -182,7 +182,6 @@ conf:
   storage:
     mon:
       directory: /var/lib/openstack-helm/ceph/mon
-      log_directory: /var/log/ceph
 
 dependencies:
   dynamic:
diff --git a/ceph-osd/templates/daemonset-osd.yaml b/ceph-osd/templates/daemonset-osd.yaml
index e1e3c4fe6..2d30b4e17 100644
--- a/ceph-osd/templates/daemonset-osd.yaml
+++ b/ceph-osd/templates/daemonset-osd.yaml
@@ -261,7 +261,7 @@ spec:
           emptyDir: {}
         - name: pod-var-log
           hostPath:
-            path: {{ .Values.conf.storage.osd_log_directory }}
+            path: {{ print "/var/log/ceph/" $envAll.Release.Name }}
         - name: pod-run
           emptyDir:
             medium: "Memory"
diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml
index c0c78cfe3..f3af8101e 100644
--- a/ceph-osd/values.yaml
+++ b/ceph-osd/values.yaml
@@ -107,7 +107,6 @@ 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: