Updated Branches: refs/heads/master c23507304 -> f4a2298ca
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. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f4a2298c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f4a2298c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f4a2298c Branch: refs/heads/master Commit: f4a2298ca9c430449d8fc47d916699018a5ede50 Parents: c235073 Author: Wido den Hollander <w...@widodh.nl> Authored: Wed Oct 10 00:21:14 2012 +0200 Committer: Wido den Hollander <w...@widodh.nl> Committed: Wed Oct 10 00:21:14 2012 +0200 ---------------------------------------------------------------------- .../kvm/storage/LibvirtStorageAdaptor.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f4a2298c/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java ---------------------------------------------------------------------- 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 059073f..6c55743 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());
