New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mimic: mgr/dashboard: Add http support to dashboard #24734

Merged
merged 3 commits into from Oct 29, 2018

Conversation

Projects
None yet
7 participants
@b-ranto
Copy link
Contributor

b-ranto commented Oct 24, 2018

https://tracker.ceph.com/issues/36123


This PR back-ports the http support for dashboard.

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

wido and others added some commits Jun 15, 2018

mgr/dashboard: Add option to disable SSL
Although is preferred and should be enabled by default users might
want to disable SSL as the dashboard might be running behind a proxy
which terminates the SSL.

Fixes: https://tracker.ceph.com/issues/24674

Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit 21fbfc9)

Conflicts:
	src/pybind/mgr/dashboard/controllers/docs.py: did not exist in
	mimic
mgr/dashboard: Do not require cert for http
The ceph dashboard currently requires a SSL certificate even if it is
not running in the SSL mode since it is always querying for the
certificate file/key pair.

This patch fixes the behaviour by querying for the certificate file/key
only if it is running in the SSL mode.

Fixes: http://tracker.ceph.com/issues/36069

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 20ed0de)
mgr/dashboard: Rename SSLCherryPyConfig
The class does not always set up SSL, dropping the SSL bit.

Fixes: http://tracker.ceph.com/issues/36069

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 035b3a8)

@b-ranto b-ranto requested review from LenzGr and votdev Oct 24, 2018

@votdev votdev added the dashboard label Oct 24, 2018

@votdev votdev changed the title mimic: Add http support to dashboard mimic: mgr/dashboard: Add http support to dashboard Oct 24, 2018

@ricardoasmarques ricardoasmarques added this to the mimic milestone Oct 24, 2018

@yuriw

This comment has been minimized.

Copy link
Contributor

yuriw commented Oct 24, 2018

@LenzGr

LenzGr approved these changes Oct 25, 2018

Copy link
Contributor

LenzGr left a comment

LGTM - thanks!

@votdev votdev requested review from rjfd and sebastian-philipp Oct 25, 2018

@votdev

votdev approved these changes Oct 25, 2018

@yuriw yuriw merged commit 26f8c5a into ceph:mimic Oct 29, 2018

4 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details

@b-ranto b-ranto deleted the b-ranto:wip-mimic-http branch Oct 30, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment