]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
* 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>
1  2 
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/orchestrator/module.py
src/python-common/ceph/deployment/service_spec.py

Simple merge
Simple merge