From 561cede1ef213e67db54618d2eb5671b81f8eb4e Mon Sep 17 00:00:00 2001 From: Olivier Date: Thu, 25 Nov 2021 09:07:07 +0100 Subject: [PATCH] object: fix rgw ceph config use Zone and ZoneGroup instead of storename for rgw_zone and rgw_zonegroup Signed-off-by: Olivier Bouffet (cherry picked from commit c92270cd6622fb0f3b8eac72ca7be1bae2f0d104) --- pkg/operator/ceph/object/config.go | 8 ++++---- pkg/operator/ceph/object/rgw.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/operator/ceph/object/config.go b/pkg/operator/ceph/object/config.go index 0469998b3677..f4884579be7d 100644 --- a/pkg/operator/ceph/object/config.go +++ b/pkg/operator/ceph/object/config.go @@ -110,16 +110,16 @@ func (c *clusterConfig) generateKeyring(rgwConfig *rgwConfig) (string, error) { return keyring, s.CreateOrUpdate(rgwConfig.ResourceName, keyring) } -func (c *clusterConfig) setDefaultFlagsMonConfigStore(rgwName string) error { +func (c *clusterConfig) setDefaultFlagsMonConfigStore(rgwConfig *rgwConfig) error { monStore := cephconfig.GetMonStore(c.context, c.clusterInfo) - who := generateCephXUser(rgwName) + who := generateCephXUser(rgwConfig.ResourceName) configOptions := make(map[string]string) configOptions["rgw_log_nonexistent_bucket"] = "true" configOptions["rgw_log_object_name_utc"] = "true" configOptions["rgw_enable_usage_log"] = "true" - configOptions["rgw_zone"] = c.store.Name - configOptions["rgw_zonegroup"] = c.store.Name + configOptions["rgw_zone"] = rgwConfig.Zone + configOptions["rgw_zonegroup"] = rgwConfig.ZoneGroup for flag, val := range configOptions { err := monStore.Set(who, flag, val) diff --git a/pkg/operator/ceph/object/rgw.go b/pkg/operator/ceph/object/rgw.go index 6cb50cb03802..f8e9e40494b8 100644 --- a/pkg/operator/ceph/object/rgw.go +++ b/pkg/operator/ceph/object/rgw.go @@ -127,7 +127,7 @@ func (c *clusterConfig) startRGWPods(realmName, zoneGroupName, zoneName string) // Unfortunately, on upgrade we would not set the flags which is not ideal for old clusters where we were no setting those flags // The KV supports setting those flags even if the RGW is running logger.Info("setting rgw config flags") - err = c.setDefaultFlagsMonConfigStore(rgwConfig.ResourceName) + err = c.setDefaultFlagsMonConfigStore(rgwConfig) if err != nil { // Getting EPERM typically happens when the flag may not be modified at runtime // This is fine to ignore