From a11530397c88b3d05d6ec338807a34cf78a21bd7 Mon Sep 17 00:00:00 2001 From: Wido den Hollander Date: Wed, 10 Oct 2012 00:21:14 +0200 Subject: [PATCH] rbd: Make secret usage names unique for all pools Since only the cephx user like 'admin' was passed we couldn't define two RBD storage pools using the cephx user admin, even if they were running on different Ceph clusters. By adding the monitor hostname and poolname to the secret's usage (which we don't even use) it becomes unique. --- .../com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java index 059073f4f69..6c55743696d 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java @@ -212,7 +212,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { Secret s = null; - sd.setCephName(userInfoTemp[0]); + sd.setCephName(userInfoTemp[0] + "@" + host + ":" + port + "/" + path); try { s_logger.debug(sd.toString());