From f34441a373651b5db424a125eeeab775d8d9a4b7 Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Tue, 10 Jan 2017 01:52:29 +0000
Subject: [PATCH] Cinder Ceph RBD backend

This commit adds support for a Ceph RBD backend
---
 cinder/templates/configmap-etc.yaml           |  4 +
 cinder/templates/deployment-volume.yaml       | 74 +++++++++++++++++++
 cinder/templates/etc/_ceph-cinder.keyring.tpl |  6 ++
 cinder/templates/etc/_ceph.conf.tpl           | 16 ++++
 cinder/values.yaml                            |  1 +
 5 files changed, 101 insertions(+)
 create mode 100644 cinder/templates/deployment-volume.yaml
 create mode 100644 cinder/templates/etc/_ceph-cinder.keyring.tpl
 create mode 100644 cinder/templates/etc/_ceph.conf.tpl

diff --git a/cinder/templates/configmap-etc.yaml b/cinder/templates/configmap-etc.yaml
index d3c2bab3..9563ed87 100644
--- a/cinder/templates/configmap-etc.yaml
+++ b/cinder/templates/configmap-etc.yaml
@@ -7,3 +7,7 @@ data:
 {{ tuple "etc/_cinder.conf.tpl" . | include "template" | indent 4 }}
   api-paste.ini: |+
 {{ tuple "etc/_cinder-api-paste.ini.tpl" . | include "template" | indent 4 }}
+  ceph.conf: |+
+{{ tuple "etc/_ceph.conf.tpl" . | include "template" | indent 4 }}
+  ceph.client.{{ .Values.ceph.cinder_user }}.keyring: |+
+{{ tuple "etc/_ceph-cinder.keyring.tpl" . | include "template" | indent 4 }}
diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml
new file mode 100644
index 00000000..24d57636
--- /dev/null
+++ b/cinder/templates/deployment-volume.yaml
@@ -0,0 +1,74 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: cinder-volume
+spec:
+  replicas: {{ .Values.replicas }}
+  template:
+    metadata:
+      labels:
+        app: cinder-volume
+      annotations:
+        pod.beta.kubernetes.io/init-containers: '[
+          {
+            "name": "init",
+            "image": {{ .Values.images.dep_check | quote }},
+            "imagePullPolicy": {{ .Values.images.pull_policy | quote }},
+            "env": [
+              {
+                "name": "NAMESPACE",
+                "value": "{{ .Release.Namespace }}"
+              },
+              {
+                "name": "DEPENDENCY_SERVICE",
+                "value": "{{  include "joinListWithColon" .Values.dependencies.volume.service }}"
+              },
+              {
+                "name": "COMMAND",
+                "value": "echo done"
+              }
+            ]
+          }
+        ]'
+    spec:
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+      containers:
+        - name: cinder-volume
+          image: {{ .Values.images.volume }}
+          imagePullPolicy: {{ .Values.images.pull_policy }}
+          command:
+          - cinder-volume
+          - --config-dir
+          - /etc/cinder/conf
+          volumeMounts:
+            - name: pod-etc-cinder
+              mountPath: /etc/cinder
+            - name: pod-var-cache-cinder
+              mountPath: /var/cache/cinder
+            - name: cinderconf
+              mountPath: /etc/cinder/conf/cinder.conf
+              subPath: cinder.conf
+              readOnly: true
+            - name: cephconf
+              mountPath: /etc/ceph/ceph.conf
+              subPath: ceph.conf
+              readOnly: true
+            - name: cephclientcinderkeyring
+              mountPath: /etc/ceph/ceph.client.{{ .Values.ceph.cinder_user }}.keyring
+              subPath: ceph.client.{{ .Values.ceph.cinder_user }}.keyring
+              readOnly: true
+      volumes:
+        - name: pod-etc-cinder
+          emptyDir: {}
+        - name: pod-var-cache-cinder
+          emptyDir: {}
+        - name: cinderconf
+          configMap:
+            name: cinder-etc
+        - name: cephconf
+          configMap:
+            name: cinder-etc
+        - name: cephclientcinderkeyring
+          configMap:
+            name: cinder-etc
diff --git a/cinder/templates/etc/_ceph-cinder.keyring.tpl b/cinder/templates/etc/_ceph-cinder.keyring.tpl
new file mode 100644
index 00000000..fb65f1ff
--- /dev/null
+++ b/cinder/templates/etc/_ceph-cinder.keyring.tpl
@@ -0,0 +1,6 @@
+[client.{{ .Values.ceph.cinder_user }}]
+{{- if .Values.ceph.cinder_keyring }}
+    key = {{ .Values.ceph.cinder_keyring }}
+{{- else }}
+    key = {{- include "secrets/ceph-client-key" . -}}
+{{- end }}
diff --git a/cinder/templates/etc/_ceph.conf.tpl b/cinder/templates/etc/_ceph.conf.tpl
new file mode 100644
index 00000000..7d2576bf
--- /dev/null
+++ b/cinder/templates/etc/_ceph.conf.tpl
@@ -0,0 +1,16 @@
+[global]
+rgw_thread_pool_size = 1024
+rgw_num_rados_handles = 100
+{{- if .Values.ceph.monitors }}
+[mon]
+{{ range .Values.ceph.monitors }}
+    [mon.{{ . }}]
+      host = {{ . }}
+      mon_addr = {{ . }}
+{{ end }}
+{{- else }}
+mon_host = ceph-mon.ceph
+{{- end }}
+[client]
+  rbd_cache_enabled = true
+  rbd_cache_writethrough_until_flush = true
diff --git a/cinder/values.yaml b/cinder/values.yaml
index c1956baa..a08d3923 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -17,6 +17,7 @@ images:
   ks_service: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
   ks_endpoints: quay.io/stackanetes/stackanetes-kolla-toolbox:newton
   api: quay.io/stackanetes/stackanetes-cinder-api:newton
+  volume: quay.io/stackanetes/stackanetes-cinder-volume:newton
   pull_policy: "IfNotPresent"
 
 keystone: