From f03e618d2792dacf8c54456cc41762b0ac51223e Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Mon, 13 Nov 2017 19:46:55 -0600
Subject: [PATCH] Gnocchi: Keystone secret for k8s 1.8

This PS updates the keystone secret in Gnocci to be compatible with
Kubernetes 1.8 which has stricter requirements for secret
definitions.

Change-Id: Ie5799bdb531fab02ba0c817bdd9d692f3cedd0a9
---
 gnocchi/templates/bin/_storage-init.sh.tpl | 3 +--
 gnocchi/templates/secret-keystone.yaml     | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/gnocchi/templates/bin/_storage-init.sh.tpl b/gnocchi/templates/bin/_storage-init.sh.tpl
index 3aca356bc3..975ea7f232 100644
--- a/gnocchi/templates/bin/_storage-init.sh.tpl
+++ b/gnocchi/templates/bin/_storage-init.sh.tpl
@@ -50,7 +50,6 @@ metadata:
   name: "${RBD_POOL_SECRET}"
 type: kubernetes.io/rbd
 data:
-  key: |
-    $( echo ${ENCODED_KEYRING} )
+  key: $( echo ${ENCODED_KEYRING} )
 EOF
 kubectl create --namespace ${NAMESPACE} -f ${SECRET}
diff --git a/gnocchi/templates/secret-keystone.yaml b/gnocchi/templates/secret-keystone.yaml
index c7cf21ee39..829bb8e0f1 100644
--- a/gnocchi/templates/secret-keystone.yaml
+++ b/gnocchi/templates/secret-keystone.yaml
@@ -29,9 +29,7 @@ metadata:
 type: Opaque
 data:
 {{- tuple $userClass "internal" $envAll | include "helm-toolkit.snippets.keystone_secret_openrc" | indent 2 }}
-  OS_AUTH_TYPE: |
-{{ $osAuthType  | b64enc | indent 4 }}
-  OS_TENANT_NAME: |
-{{ $osTenantName | b64enc | indent 4 }}
+  OS_AUTH_TYPE: {{ $osAuthType  | b64enc }}
+  OS_TENANT_NAME: {{ $osTenantName | b64enc }}
 {{ end }}
 {{- end }}