From 3e92872648691a28c1fd361e9722d970de801f82 Mon Sep 17 00:00:00 2001
From: Seungkyu Ahn <seungkyua@gmail.com>
Date: Tue, 17 Oct 2017 21:10:43 +0900
Subject: [PATCH] Fix glance storage init script error in k8s v1.8.x

A Secret of images-rbd-keyring.yaml is failed because of line feed.

Change-Id: I9ad8a3815a6158df19339b5977725c32cc71c559
Closes-bug: 1724229
---
 glance/templates/bin/_storage-init.sh.tpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/glance/templates/bin/_storage-init.sh.tpl b/glance/templates/bin/_storage-init.sh.tpl
index dd64749107..754cbb82f9 100644
--- a/glance/templates/bin/_storage-init.sh.tpl
+++ b/glance/templates/bin/_storage-init.sh.tpl
@@ -55,8 +55,7 @@ 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}
 elif [ "x$STORAGE_BACKEND" == "xradosgw" ]; then