Improve rook support

BTrDB · Oct 15, 2018 · 31f5a5c · 31f5a5c
1 parent 74e8a49
commit 31f5a5c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/manifest_templates/btrdb.statefulset.yaml b/manifest_templates/btrdb.statefulset.yaml
@@ -55,6 +55,8 @@ spec:
             value: "NO"
           - name: BTRDB_ENABLE_OBLITERATE
             value: "YES"
+          - name: CEPH_CONFIG
+            value: {{.SiteInfo.Ceph.ConfigFile}}
           - name: MY_POD_NAME
             valueFrom:
               fieldRef:
@@ -63,20 +65,35 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
+{{ if .SiteInfo.Ceph.MountConfig }}
+        volumeMounts:
+        - name: ceph-config
+          mountPath: {{.SiteInfo.Ceph.ConfigPath}}
+          readOnly: true
+{{ else }}
         volumeMounts:
           - name: ceph-keyring
             mountPath: /etc/ceph/
             readOnly: true
+{{ end }}
         ports:
         - containerPort: 4410
           protocol: TCP
         - containerPort: 9000
           protocol: TCP
       terminationGracePeriodSeconds: 600
+{{ if .SiteInfo.Ceph.MountConfig }}
+      volumes:
+      - name: ceph-config
+        hostPath:
+          path: {{.SiteInfo.Ceph.ConfigPath}}
+          type: Directory
+{{ else }}
       volumes:
         - name: ceph-keyring
           secret:
             secretName: ceph-keyring
+{{ end }}
 ---
 apiVersion: v1
 kind: Service

diff --git a/mfgen/main.go b/mfgen/main.go
@@ -12,7 +12,7 @@ import (
 
 //go:generate go-bindata -o templates.go -prefix ../manifest_templates ../manifest_templates/
 
-const PackageVersion = "4.15.0"
+const PackageVersion = "4.15.3"
 
 func main() {
 	app := cli.NewApp()

diff --git a/mfgen/siteconfig.go b/mfgen/siteconfig.go
@@ -58,7 +58,7 @@ siteInfo:
     btrdbJournalPool: btrdb_journal
     # If you are using Rook, the recommended way to connect to ceph
     # is to mount the config file directly. Uncomment this to do so
-    # configFile: /var/rook/rook-ceph/rook-ceph.config
+    # configFile: /var/lib/rook/rook-ceph/rook-ceph.config
     # mountConfig: true
 
   etcd: