From: Sage Weil <sage@redhat.com>
Date: Fri, 1 Nov 2019 16:51:30 +0000 (-0500)
Subject: mgr/ssh: rgw: ensure map rgws are mapped to the zone
X-Git-Tag: v15.1.0~1031^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b3097bf8b020e8b6ae877fe2cde961e13567f8da;p=ceph.git

mgr/ssh: rgw: ensure map rgws are mapped to the zone

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py
index f8bee40150f9..1144278bee29 100644
--- a/src/pybind/mgr/ssh/module.py
+++ b/src/pybind/mgr/ssh/module.py
@@ -974,6 +974,13 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
     def add_rgw(self, spec):
         if len(spec.placement.nodes) < spec.count:
             raise RuntimeError("must specify at least %d hosts" % spec.count)
+        # ensure rgw_zone is set for these daemons
+        ret, out, err = self.mon_command({
+            'prefix': 'config set',
+            'who': 'client.rgw.' + spec.name,
+            'name': 'rgw_zone',
+            'value': spec.name,
+        })
         daemons = self._get_services('rgw')
         results = []
         num_added = 0