]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #34042 into octopus 34105/head
authorSage Weil <sage@redhat.com>
Sun, 22 Mar 2020 23:32:11 +0000 (18:32 -0500)
committerSage Weil <sage@redhat.com>
Sun, 22 Mar 2020 23:32:11 +0000 (18:32 -0500)
commit243cbd6224921f7f5c2463705c75cb9eafd0db5c
treec2c3b47f2613edc562bbfcdc6d920bd7ec0957e8
parent2740349122bf1f207b8dac3e2053abd9618537d0
parent818b8583c84b9aabdd8a9b5d661608904c60ae67
Merge PR #34042 into octopus

* refs/pull/34042/head:
mgr/rook: list rgw services
mgr/rook: tolerate timestamps that are None
mgr/orch: add 'subcluster' property to RGWSpec
mgr/rook: do not create radosgw pools
mgr/rook: refactor apply/add for rgw
mgr/cephadm: configure rgw_frontends for rgw service
mgr/orch: accept port and ssl flags to 'apply rgw'
python-common/ceph/deployment/service_spec: add ssl to RGWSpec
mgr/rook: fix 'orch ps' for osds

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/orchestrator/module.py
src/python-common/ceph/deployment/service_spec.py