From: Wido den Hollander <wido@42on.com>
Date: Tue, 16 Apr 2019 22:18:38 +0000 (+0200)
Subject: mgr/dashboard: Do not default to 'admin' as Admin Resource
X-Git-Tag: v15.1.0~2833^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83b10bac4e382a510e5fc4066b90f67bbe526844;p=ceph.git

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>
---

diff --git a/src/pybind/mgr/dashboard/services/rgw_client.py b/src/pybind/mgr/dashboard/services/rgw_client.py
index 72b6b1d913e..d148235c538 100644
--- a/src/pybind/mgr/dashboard/services/rgw_client.py
+++ b/src/pybind/mgr/dashboard/services/rgw_client.py
@@ -273,7 +273,7 @@ class RgwClient(RestClient):
                  secret_key,
                  host=None,
                  port=None,
-                 admin_path='admin',
+                 admin_path=None,
                  ssl=False):
 
         if not host and not RgwClient._host: