From f1fd705852bc91f8dac37ba04b13feb3a883c6b8 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Wed, 15 Mar 2017 14:33:11 -0500
Subject: [PATCH] Add missing template for nova configmap-etc

The ceph client cinder keyring template was missing from nova's
etc templates. This simply adds it in for the nova configmap to
consume
---
 .../etc/_ceph.client.cinder.keyring.yaml.tpl  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 nova/templates/etc/_ceph.client.cinder.keyring.yaml.tpl

diff --git a/nova/templates/etc/_ceph.client.cinder.keyring.yaml.tpl b/nova/templates/etc/_ceph.client.cinder.keyring.yaml.tpl
new file mode 100644
index 0000000000..1a0200d098
--- /dev/null
+++ b/nova/templates/etc/_ceph.client.cinder.keyring.yaml.tpl
@@ -0,0 +1,20 @@
+# Copyright 2017 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+[client.{{ .Values.ceph.cinder_user }}]
+{{- if .Values.ceph.cinder_keyring }}
+    key = {{ .Values.ceph.cinder_keyring }}
+{{- else }}
+    key = {{- include "secrets/ceph-client-key" . -}}
+{{- end }}