From 1aa1aa70e42bb1bf099cd079a48e9922a1d0d9b5 Mon Sep 17 00:00:00 2001
From: Alan Meadows <alan.meadows@gmail.com>
Date: Wed, 30 Nov 2016 14:13:11 -0800
Subject: [PATCH 1/4] ensure ceph storage is persistent

---
 ceph/templates/daemonset.yaml | 10 ++++------
 ceph/values.yaml              |  4 ++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ceph/templates/daemonset.yaml b/ceph/templates/daemonset.yaml
index 9e0e554cfd..6c350cbe05 100644
--- a/ceph/templates/daemonset.yaml
+++ b/ceph/templates/daemonset.yaml
@@ -20,9 +20,8 @@ spec:
           hostPath:
             path: /dev
         - name: ceph
-          emptyDir: {}
-#          hostPath:
-#            path: /opt/ceph
+          hostPath:
+            path: {{ .Values.storage.var_directory }}
         - name: ceph-conf
           secret:
             secretName: ceph-conf-combined
@@ -36,9 +35,8 @@ spec:
           secret:
             secretName: ceph-bootstrap-rgw-keyring
         - name: osd-directory
-          emptyDir: {}
-#          hostPath:
-#            path: /home/core/data/ceph/osd
+          hostPath:
+            path: {{ .Values.storage.osd_directory }}
       containers:
         - name: osd-pod
           image: {{ .Values.images.daemon }}
diff --git a/ceph/values.yaml b/ceph/values.yaml
index c90d197c8d..550536cdb3 100644
--- a/ceph/values.yaml
+++ b/ceph/values.yaml
@@ -20,3 +20,7 @@ network:
     mon: 6789
     rgw_ingress: 80
     rgw_target: 8088
+
+storage:
+  osd_directory: /var/lib/aic-helm/ceph/osd
+  var_directory: /var/lib/aic-helm/ceph/ceph
\ No newline at end of file

From c10545fb6b3b71b9de5772bcfe28e4905cdedda7 Mon Sep 17 00:00:00 2001
From: Alan Meadows <alan.meadows@gmail.com>
Date: Wed, 30 Nov 2016 14:21:33 -0800
Subject: [PATCH 2/4] add secrets directory (empty)

---
 common/.gitignore       | 1 +
 common/secrets/.gitkeep | 0
 2 files changed, 1 insertion(+)
 create mode 100644 common/secrets/.gitkeep

diff --git a/common/.gitignore b/common/.gitignore
index d1f0fc1755..e1bd7e85af 100644
--- a/common/.gitignore
+++ b/common/.gitignore
@@ -1,2 +1,3 @@
 secrets/*
+!secrets/.gitkeep 
 templates/_secrets.tpl
diff --git a/common/secrets/.gitkeep b/common/secrets/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2

From 675e2ef1325b7d1cc18f106550107ad0309011fc Mon Sep 17 00:00:00 2001
From: Alan Meadows <alan.meadows@gmail.com>
Date: Wed, 30 Nov 2016 14:36:21 -0800
Subject: [PATCH 3/4] allow mariadb volume flexibility

---
 mariadb/templates/mariadb-deployment.yaml | 2 +-
 mariadb/values.yaml                       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mariadb/templates/mariadb-deployment.yaml b/mariadb/templates/mariadb-deployment.yaml
index 43722189ff..09ed86db91 100644
--- a/mariadb/templates/mariadb-deployment.yaml
+++ b/mariadb/templates/mariadb-deployment.yaml
@@ -34,7 +34,7 @@ apiVersion: v1
 metadata:
   name: mariadb-{{$v}}
   annotations:
-    volume.beta.kubernetes.io/storage-class: "general"  
+    {{ $root.Values.storage.class_path }}: {{ $root.Values.storage.class_name }}  
 spec:
   accessModes: [ "ReadWriteOnce" ]
   resources:
diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index 8d87d7ee68..5f7ee60091 100644
--- a/mariadb/values.yaml
+++ b/mariadb/values.yaml
@@ -9,6 +9,8 @@ images:
   mariadb: quay.io/stackanetes/stackanetes-mariadb:newton
 
 volume:
+  class_path: volume.alpha.kubernetes.io/storage-class
+  class_name: general
   size: 20Gi
 
 labels:

From 0370ceaf80386f7de83cb54865b465c5c383b6a5 Mon Sep 17 00:00:00 2001
From: Alan Meadows <alan.meadows@gmail.com>
Date: Wed, 30 Nov 2016 14:38:46 -0800
Subject: [PATCH 4/4] fix values reference typo

---
 mariadb/templates/mariadb-deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mariadb/templates/mariadb-deployment.yaml b/mariadb/templates/mariadb-deployment.yaml
index 09ed86db91..c3f6887941 100644
--- a/mariadb/templates/mariadb-deployment.yaml
+++ b/mariadb/templates/mariadb-deployment.yaml
@@ -34,7 +34,7 @@ apiVersion: v1
 metadata:
   name: mariadb-{{$v}}
   annotations:
-    {{ $root.Values.storage.class_path }}: {{ $root.Values.storage.class_name }}  
+    {{ $root.Values.volume.class_path }}: {{ $root.Values.volume.class_name }}  
 spec:
   accessModes: [ "ReadWriteOnce" ]
   resources: