From d1319f3ce82ab15554f4023177c07a9e3a14b3cc Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 2 Sep 2014 13:50:19 -0400 Subject: [PATCH] rbd/glance/keyring: fix wrong collected resource In the commit 8e537e4b50bdfbc87a5914baca4e93c45ddce918, a wrong resource collection has been introduced which can make fail the situation when Glance API & Cinder Volume are not on the same nodes. For Glance, the resource collected was the Cinder keyring instead of Glance keyring. This patch fix this regression introduced on 4th march. Signed-off-by: Emilien Macchi --- manifests/storage/rbd/pools.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/storage/rbd/pools.pp b/manifests/storage/rbd/pools.pp index 9136dc6e..a61d544f 100644 --- a/manifests/storage/rbd/pools.pp +++ b/manifests/storage/rbd/pools.pp @@ -63,7 +63,7 @@ class cloud::storage::rbd::pools( secret => $::ceph_keyring_glance, keyring_path => "/etc/ceph/ceph.client.${glance_rbd_user}.keyring" } - Ceph::Key <<| title == $cinder_rbd_user |>> + Ceph::Key <<| title == $glance_rbd_user |>> } if $::ceph_keyring_cinder {