From: Sage Weil <sage@redhat.com>
Date: Thu, 19 Mar 2020 13:22:40 +0000 (-0500)
Subject: Merge PR #34027 into octopus
X-Git-Tag: v15.2.0~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3ed3f34b9801edf2529295b008b27adee1965640;p=ceph-ci.git

Merge PR #34027 into octopus

* refs/pull/34027/head:
	qa/workunits/cephadm/test_cephadm: mark services unmanaged for test
	mgr/cephadm: do not reconfig unmanaged services
	qa/workunits/cephadm/test_cephadm: output file for pub key

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

3ed3f34b9801edf2529295b008b27adee1965640