From 2cc5682a350f92cf8fa52ff269ee19c59651b2b7 Mon Sep 17 00:00:00 2001 From: parth-gr Date: Wed, 31 Jan 2024 10:06:44 +0530 Subject: [PATCH] object: fix the deafult multisite zonegroup creation there was a bug in the code which doesn't sets realm if we try to get the zonegoup so because of that 1.12 this backport pr for original change was not working Signed-off-by: parth-gr (cherry picked from commit a9c77280c6cde03cf129afc988711ad7135fe98c) --- pkg/operator/ceph/object/objectstore.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/operator/ceph/object/objectstore.go b/pkg/operator/ceph/object/objectstore.go index 0b1f984fe..78645c570 100644 --- a/pkg/operator/ceph/object/objectstore.go +++ b/pkg/operator/ceph/object/objectstore.go @@ -392,7 +392,11 @@ func createMultisiteConfigurations(objContext *Context, configType, configTypeAr args = append([]string{configType}, args...) args = append(args, configTypeArg) // get the multisite config before creating - output, getConfigErr := RunAdminCommandNoMultisite(objContext, true, configType, "get", configTypeArg) + configTypeArgs := []string{configType, "get", configTypeArg} + if configType == "zonegroup" { + configTypeArgs = append(configTypeArgs, fmt.Sprintf("--rgw-realm=%s", objContext.Realm)) + } + output, getConfigErr := RunAdminCommandNoMultisite(objContext, true, configTypeArgs...) if getConfigErr == nil { return nil }