]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
mgr/dashboard: Do not default to 'admin' as Admin Resource
authorWido den Hollander <wido@42on.com>
Tue, 16 Apr 2019 22:18:38 +0000 (00:18 +0200)
committerWido den Hollander <wido@42on.com>
Tue, 16 Apr 2019 22:23:31 +0000 (00:23 +0200)
commit83b10bac4e382a510e5fc4066b90f67bbe526844
tree7577693e0556d1cadfa25054464ce61ef8a299eb
parent0b0b89ee08c7c4e30fca748381a42e9c98adabc2
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>
src/pybind/mgr/dashboard/services/rgw_client.py