From a1b8f394b269087d0f286dd69b040a87807ac5f8 Mon Sep 17 00:00:00 2001
From: Chinasubbareddy M <cr3938@att.com>
Date: Wed, 24 Oct 2018 15:45:43 -0500
Subject: [PATCH] ceph: make log directory configurable

this is make log directory configurable incase if  another mon or
osd running on same host can point to other directory

Change-Id: I2db6dffd45599386f8082db8f893c799d139aba3
---
 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, 4 insertions(+), 2 deletions(-)

diff --git a/ceph-mon/templates/daemonset-mon.yaml b/ceph-mon/templates/daemonset-mon.yaml
index f6ebf6ae..7a240779 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: /var/log/ceph
+            path: {{ .Values.conf.storage.mon.log_directory }}
         - name: ceph-mon-bin
           configMap:
             name: ceph-mon-bin
diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml
index d457019d..b41e27ec 100644
--- a/ceph-mon/values.yaml
+++ b/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:
diff --git a/ceph-osd/templates/daemonset-osd.yaml b/ceph-osd/templates/daemonset-osd.yaml
index 70180cde..e1e3c4fe 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: /var/log/ceph
+            path: {{ .Values.conf.storage.osd_log_directory }}
         - name: pod-run
           emptyDir:
             medium: "Memory"
diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml
index 537a98ed..ba5886e5 100644
--- a/ceph-osd/values.yaml
+++ b/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: