]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #58255 from rhcs-dashboard/wip-66254-squid
authorPedro Gonzalez Gomez <pegonzal@redhat.com>
Thu, 11 Jul 2024 09:06:51 +0000 (11:06 +0200)
committerGitHub <noreply@github.com>
Thu, 11 Jul 2024 09:06:51 +0000 (11:06 +0200)
squid: mgr/dashboard: rgw bucket replication management

Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
1  2 
src/pybind/mgr/dashboard/controllers/rgw.py
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.ts

index fc3ed0cbbd13825e0eb7fe3137e6fa0197c3defd,5d2e00bd93e01a8ac3bf583023853424802ffc51..08f62a2f315f7399685d64c253d28475dbe63b2e
@@@ -364,8 -470,9 +470,9 @@@ class RgwBucket(RgwRESTController)
          result['encryption'] = encryption['Status']
          result['versioning'] = versioning['Status']
          result['mfa_delete'] = versioning['MfaDelete']
 -        result['bucket_policy'] = self._get_policy(bucket_name)
 +        result['bucket_policy'] = self._get_policy(bucket_name, daemon_name, result['owner'])
          result['acl'] = self._get_acl(bucket_name, daemon_name, result['owner'])
+         result['replication'] = self._get_replication(bucket_name, result['owner'], daemon_name)
  
          # Append the locking configuration.
          locking = self._get_locking(result['owner'], daemon_name, bucket_name)