mgr/cephadm: rgw update period after realm, zone creation

Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>

diff --git a/doc/cephadm/install.rst b/doc/cephadm/install.rst
index 4156dc6fa4c70ab6643eb50f0522a91105dd2f24..93af310b863ad35e0e47053f026e7f20412d276f 100644 (file)
--- a/doc/cephadm/install.rst
+++ b/doc/cephadm/install.rst
@@ -401,6 +401,8 @@ Alternatively, the realm, zonegroup, and zone can be manually created using ``ra
 
   # radosgw-admin zone create --rgw-zonegroup=<zonegroup-name> --rgw-zone=<zone-name> --master --default
 
+  # radosgw-admin period update --rgw-realm=<realm-name> --commit
+
 See :ref:`orchestrator-cli-placement-spec` for details of the placement specification.
 
 Deploying NFS ganesha

diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py
index 4af2c7e35ec1ef5182fc4527ca0415e4ee70b3f0..20282e5720c8870791640b4c2b103a901adbd2df 100644 (file)
--- a/src/pybind/mgr/cephadm/services/cephadmservice.py
+++ b/src/pybind/mgr/cephadm/services/cephadmservice.py
@@ -361,7 +361,6 @@ class MdsService(CephadmService):
 class RgwService(CephadmService):
     TYPE = 'rgw'
 
-
     def config(self, spec: RGWSpec, rgw_id: str):
         assert self.TYPE == spec.service_type
 
@@ -450,85 +449,115 @@ class RgwService(CephadmService):
         keyring = self.get_keyring(rgw_id).split('key = ',1)[1].rstrip()
 
         # We can call radosgw-admin within the container, cause cephadm gives the MGR the required keyring permissions
-        # get realms
-        cmd = ['radosgw-admin',
-               '--key=%s'%keyring,
-               '--user', 'rgw.%s'%rgw_id,
-               'realm', 'list',
-               '--format=json']
-        result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        # create realm if needed
-        cmd = ['radosgw-admin',
-               '--key=%s'%keyring,
-               '--user', 'rgw.%s'%rgw_id,
-               'realm', 'create',
-               '--rgw-realm=%s'%spec.rgw_realm,
-               '--default']
-        if not result.stdout:
+
+        def get_realms() -> List[str]:
+            cmd = ['radosgw-admin',
+                   '--key=%s'%keyring,
+                   '--user', 'rgw.%s'%rgw_id,
+                   'realm', 'list',
+                   '--format=json']
             result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            self.mgr.log.info('created realm: %s'%spec.rgw_realm)
-        else:
+            out = result.stdout
+            if not out:
+                return []
             try:
-                j = json.loads(result.stdout)
-                if 'realms' not in j or spec.rgw_realm not in j['realms']:
-                    result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                    self.mgr.log.info('created realm: %s'%spec.rgw_realm)
+                j = json.loads(out)
+                return j.get('realms', [])
             except Exception as e:
                 raise OrchestratorError('failed to parse realm info')
 
-        # get zonegroup
-        cmd = ['radosgw-admin',
-               '--key=%s'%keyring,
-               '--user', 'rgw.%s'%rgw_id,
-               'zonegroup', 'list',
-               '--format=json']
-        result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        #create zonegroup if needed
-        cmd = ['radosgw-admin',
-               '--key=%s'%keyring,
-               '--user', 'rgw.%s'%rgw_id,
-               'zonegroup', 'create',
-               '--rgw-zonegroup=default',
-               '--master', '--default']
-        if not result.stdout:
+        def create_realm():
+            cmd = ['radosgw-admin',
+                   '--key=%s'%keyring,
+                   '--user', 'rgw.%s'%rgw_id,
+                   'realm', 'create',
+                   '--rgw-realm=%s'%spec.rgw_realm,
+                   '--default']
             result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            self.mgr.log.info('created zonegroup: default')
-        else:
+            self.mgr.log.info('created realm: %s'%spec.rgw_realm)
+
+        def get_zonegroups() -> List[str]:
+            cmd = ['radosgw-admin',
+                   '--key=%s'%keyring,
+                   '--user', 'rgw.%s'%rgw_id,
+                   'zonegroup', 'list',
+                   '--format=json']
+            result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            out = result.stdout
+            if not out:
+                return []
             try:
-                j = json.loads(result.stdout)
-                if 'zonegroups' not in j or 'default' not in j['zonegroups']:
-                    result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                    self.mgr.log.info('created zonegroup: default')
+                j = json.loads(out)
+                return j.get('zonegroups', [])
             except Exception as e:
                 raise OrchestratorError('failed to parse zonegroup info')
 
-        #get zones
-        cmd = ['radosgw-admin',
-               '--key=%s'%keyring,
-               '--user', 'rgw.%s'%rgw_id,
-               'zone', 'list',
-               '--format=json']
-        result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        #create zone if needed
-        cmd = ['radosgw-admin',
-               '--key=%s'%keyring,
-               '--user', 'rgw.%s'%rgw_id,
-               'zone', 'create',
-               '--rgw-zonegroup=default',
-               '--rgw-zone=%s'%spec.rgw_zone,
-               '--master', '--default']
-        if not result.stdout:
+        def create_zonegroup():
+            cmd = ['radosgw-admin',
+                   '--key=%s'%keyring,
+                   '--user', 'rgw.%s'%rgw_id,
+                   'zonegroup', 'create',
+                   '--rgw-zonegroup=default',
+                   '--master', '--default']
             result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            self.mgr.log.info('created zone: %s'%spec.rgw_zone)
-        else:
+            self.mgr.log.info('created zonegroup: default')
+
+        def create_zonegroup_if_required():
+            zonegroups = get_zonegroups()
+            if 'default' not in zonegroups:
+                create_zonegroup()
+
+        def get_zones() -> List[str]:
+            cmd = ['radosgw-admin',
+                   '--key=%s'%keyring,
+                   '--user', 'rgw.%s'%rgw_id,
+                   'zone', 'list',
+                   '--format=json']
+            result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            out = result.stdout
+            if not out:
+                return []
             try:
-                j = json.loads(result.stdout)
-                if 'zones' not in j or spec.rgw_zone not in j['zones']:
-                    result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-                    self.mgr.log.info('created zone: %s'%spec.rgw_zone)
+                j = json.loads(out)
+                return j.get('zones', [])
             except Exception as e:
                 raise OrchestratorError('failed to parse zone info')
 
+        def create_zone():
+            cmd = ['radosgw-admin',
+                   '--key=%s'%keyring,
+                   '--user', 'rgw.%s'%rgw_id,
+                   'zone', 'create',
+                   '--rgw-zonegroup=default',
+                   '--rgw-zone=%s'%spec.rgw_zone,
+                   '--master', '--default']
+            result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            self.mgr.log.info('created zone: %s'%spec.rgw_zone)
+
+
+        changes = False
+        realms = get_realms()
+        if spec.rgw_realm not in realms:
+            create_realm()
+            changes = True
+
+        zones = get_zones()
+        if spec.rgw_zone not in zones:
+            create_zonegroup_if_required()
+            create_zone()
+            changes = True
+
+        # update period if changes were made
+        if changes:
+            cmd = ['radosgw-admin',
+                   '--key=%s'%keyring,
+                   '--user', 'rgw.%s'%rgw_id,
+                   'period', 'update',
+                   '--rgw-realm=%s'%spec.rgw_realm,
+                   '--commit']
+            result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            self.mgr.log.info('updated period')
+
 
 class RbdMirrorService(CephadmService):
     TYPE = 'rbd-mirror'