]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/dashboard: Do not default to 'admin' as Admin Resource 27868/head
authorWido den Hollander <wido@42on.com>
Tue, 16 Apr 2019 22:18:38 +0000 (00:18 +0200)
committerLenz Grimmer <lgrimmer@suse.com>
Mon, 29 Apr 2019 16:15:02 +0000 (18:15 +0200)
commitbd8ed78ec97fd46075261d96c151d7ee23fb242d
tree5137e224b943b4453aa26498b7ee7c9b36391962
parent5ad58494c5c615993b0cb28c54816c589f373287
mgr/dashboard: Do not default to 'admin' as Admin Resource

The current if-statement would always default to 'admin' as the admin
resource regardless of what 'mgr/dashboard/RGW_API_ADMIN_RESOURCE' is set
to.

In some cases users change this setting in the RGW for various reasons.

The dashboard currently does not support this and will cause the RGW management
not to work.

Fixes: http://tracker.ceph.com/issues/39338
Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit 83b10bac4e382a510e5fc4066b90f67bbe526844)
src/pybind/mgr/dashboard/services/rgw_client.py