From: Sage Weil <sage@redhat.com>
Date: Tue, 5 Nov 2019 14:55:59 +0000 (-0600)
Subject: Merge PR #31303 into master
X-Git-Tag: v15.1.0~1031
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6cca11e80aaa94add09d337ad989ad17718d48c6;p=ceph.git

Merge PR #31303 into master

* refs/pull/31303/head:
	ceph-daemon: make systemd unit descriptions Capitalized
	ceph-daemon: handle daemon names with multiple .'s
	mgr/ssh: rgw: ensure map rgws are mapped to the zone
	mgr/ssh: use . as delimiter between service group and id
	mgr/ssh: implement 'rgw update'
	mgr/orchestrator_cli: add 'rgw update' CLI command
	mgr/ssh: add 'rgw rm'
	mgr/ssh: implement 'rgw add'
	ceph-daemon: handle 'rgw' type daemons
	mgr/orchestrator_cli: rgw add: optionally take count and node names

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

6cca11e80aaa94add09d337ad989ad17718d48c6