From: Sage Weil <sage@redhat.com>
Date: Sun, 22 Mar 2020 23:32:11 +0000 (-0500)
Subject: Merge PR #34042 into octopus
X-Git-Tag: v15.2.0~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F34105%2Fhead;p=ceph.git

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>
---

243cbd6224921f7f5c2463705c75cb9eafd0db5c