From 88a5dc6aaec9489acde47e5cf3554574ea11dd1c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 4 Mar 2014 18:37:53 +0100 Subject: [PATCH] rbd/pools: avoid dupplicated resource for keyring close bug #309 Signed-off-by: Emilien Macchi --- manifests/storage/rbd/pools.pp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/manifests/storage/rbd/pools.pp b/manifests/storage/rbd/pools.pp index 1f900ea4..37c74a0b 100644 --- a/manifests/storage/rbd/pools.pp +++ b/manifests/storage/rbd/pools.pp @@ -63,12 +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 |>> -> - file { "/etc/ceph/ceph.client.${glance_rbd_user}.keyring": - owner => 'glance', - group => 'glance', - mode => '0400' - } + Ceph::Key <<| title == $cinder_rbd_user |>> } if $::ceph_keyring_cinder { @@ -77,12 +72,7 @@ class cloud::storage::rbd::pools( secret => $::ceph_keyring_cinder, keyring_path => "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring" } - Ceph::Key <<| title == $cinder_rbd_user |>> -> - file { "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring": - owner => 'cinder', - group => 'cinder', - mode => '0400' - } + Ceph::Key <<| title == $cinder_rbd_user |>> } $clients = [$glance_rbd_user, $cinder_rbd_user]