From 7a4f5c9bda3b4ffc40cb7eab7ed109ac84ab2d23 Mon Sep 17 00:00:00 2001 From: Kiefer Chang Date: Wed, 3 Jul 2019 15:42:13 +0800 Subject: [PATCH] Ceph: fix error when creating monmap Adjust keyring template because ceph-mon in Octopus fails to parse keyring file which has leading indention. Fixes: https://github.com/rook/rook/issues/3384 Signed-off-by: Kiefer Chang --- pkg/daemon/ceph/config/keyring.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/daemon/ceph/config/keyring.go b/pkg/daemon/ceph/config/keyring.go index e5d6b7e34..ef371cce4 100644 --- a/pkg/daemon/ceph/config/keyring.go +++ b/pkg/daemon/ceph/config/keyring.go @@ -30,14 +30,14 @@ const ( // AdminKeyringTemplate is a string template of Ceph keyring settings which allow connection // as admin. The key value must be filled in by the admin auth key for the cluster. AdminKeyringTemplate = ` - [client.admin] - key = %s - auid = 0 - caps mds = "allow *" - caps mon = "allow *" - caps osd = "allow *" - caps mgr = "allow *" - ` +[client.admin] + key = %s + auid = 0 + caps mds = "allow *" + caps mon = "allow *" + caps osd = "allow *" + caps mgr = "allow *" +` ) // AdminKeyring returns the filled-out admin keyring