]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #42252 into master
authorSage Weil <sage@newdream.net>
Wed, 11 Aug 2021 15:28:28 +0000 (11:28 -0400)
committerSage Weil <sage@newdream.net>
Wed, 11 Aug 2021 15:28:28 +0000 (11:28 -0400)
commit6f8bdfbb9071052e843eb2eba9e1e9eb946e1eac
tree1e15fc3a3f9f9307afedac8176a947c39293967c
parent191f1dc470a1db75d542f8e9b1e0149f7f21f4f1
parenta682b9d7a49fbd50c69494f947a6c0565ad0c78e
Merge PR #42252 into master

* refs/pull/42252/head:
mgr/dashboard: set rgw credentials: fix api tests
mgr/dashboard: run-frontend-e2e-tests.sh: remove unneeded rgw setting
mgr/dashboard: rgw service creation form: add realm and zone to service spec.
mgr/dashboard: connect-rgw: rename to set-rgw-credentials; refactoring
mgr/dashboard: connect-rgw: adaptation and test coverage
mgr/cephadm: re-check dashboard <-> rgw creds when rgw daemons created/destroyed
mgr/dashboard: add 'dashboard connect-rgw' command
doc/mgr/dashboard: simplify dashboard+rgw config docs

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/services/cephadmservice.py