From: Alfredo Deza <alfredo@deza.pe>
Date: Tue, 12 Jun 2018 10:47:51 +0000 (-0400)
Subject: Merge pull request #22510 from ceph/backport-luminous-22399
X-Git-Tag: v12.2.6~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea10250c9d36153eb63e8f8d5dffbb9d4926b9ac;p=ceph.git

Merge pull request #22510 from ceph/backport-luminous-22399

luminous: ceph-volume tests do not include admin keyring in OSD nodes

Reviewed-by: Alfredo Deza <adeza@redhat.com>
---

ea10250c9d36153eb63e8f8d5dffbb9d4926b9ac