]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/dashboard: RGW port autodetection does not support "Beast" RGW frontend 34400/head
authorVolker Theile <vtheile@suse.com>
Mon, 27 Apr 2020 07:22:44 +0000 (09:22 +0200)
committerVolker Theile <vtheile@suse.com>
Mon, 27 Apr 2020 07:23:55 +0000 (09:23 +0200)
commit153eac2f59780e99cb77fb6b6b95b2ed2191f873
tree191f353680cae39dbc5c70da7bd0463acde56f5f
parente44d481069270099eb30ebdc453ea37004e0d203
mgr/dashboard: RGW port autodetection does not support "Beast" RGW frontend

* Improve regular expressions to support more configuration variations.
* Modify error message. It includes the config line to be parsed. This should help to debug errors much easier.
* If there are multiple (ssl_)ports/(ssl_)endpoints options, then the first found option will be returned.

Fixes: https://tracker.ceph.com/issues/39252
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit d532d68878e143c207027aea3efff2d43cef2706)

Conflicts:
  src/pybind/mgr/dashboard/services/rgw_client.py
  src/pybind/mgr/dashboard/tests/test_rgw_client.py
src/pybind/mgr/dashboard/services/rgw_client.py
src/pybind/mgr/dashboard/tests/test_rgw_client.py