From 118d3bd400c97305505847553151f09a161074a2 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Tue, 4 Mar 2014 18:22:25 +0100
Subject: [PATCH] rbd: Ensure keyring has right permissions

Close bug #309
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
---
 manifests/compute/hypervisor.pp | 12 +++++-------
 manifests/image.pp              | 12 +++++-------
 manifests/volume/storage.pp     | 12 +++++-------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp
index 2129a08b..d6ca37fe 100644
--- a/manifests/compute/hypervisor.pp
+++ b/manifests/compute/hypervisor.pp
@@ -140,13 +140,11 @@ Host *
     Exec <<| tag == 'set_secret_value_virsh' |>>
 
     Ceph::Key <<| title == $cinder_rbd_user |>>
-    if defined(Ceph::Key[$cinder_rbd_user]) {
-      file { "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring":
-        owner   => 'nova',
-        group   => 'nova',
-        mode    => '0400',
-        require => Ceph::Key[$cinder_rbd_user]
-      }
+    file { "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring":
+      owner   => 'nova',
+      group   => 'nova',
+      mode    => '0400',
+      require => Ceph::Key[$cinder_rbd_user]
     }
     Concat::Fragment <<| title == 'ceph-client-os' |>>
   }
diff --git a/manifests/image.pp b/manifests/image.pp
index cc10de2a..666e9193 100644
--- a/manifests/image.pp
+++ b/manifests/image.pp
@@ -152,13 +152,11 @@ class cloud::image(
   }
 
   Ceph::Key <<| title == $glance_rbd_user |>>
-  if defined(Ceph::Key[$glance_rbd_user]) {
-    file { '/etc/ceph/ceph.client.glance.keyring':
-      owner   => 'glance',
-      group   => 'glance',
-      mode    => '0400',
-      require => Ceph::Key[$glance_rbd_user]
-    }
+  file { '/etc/ceph/ceph.client.glance.keyring':
+    owner   => 'glance',
+    group   => 'glance',
+    mode    => '0400',
+    require => Ceph::Key[$glance_rbd_user]
   }
   Concat::Fragment <<| title == 'ceph-client-os' |>>
 
diff --git a/manifests/volume/storage.pp b/manifests/volume/storage.pp
index 0dcaaff9..24759759 100644
--- a/manifests/volume/storage.pp
+++ b/manifests/volume/storage.pp
@@ -74,13 +74,11 @@ class cloud::volume::storage(
   }
 
   Ceph::Key <<| title == $cinder_rbd_user |>>
-  if defined(Ceph::Key[$cinder_rbd_user]) {
-    file { "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring":
-      owner   => 'cinder',
-      group   => 'cinder',
-      mode    => '0400',
-      require => Ceph::Key[$cinder_rbd_user]
-    }
+  file { "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring":
+    owner   => 'cinder',
+    group   => 'cinder',
+    mode    => '0400',
+    require => Ceph::Key[$cinder_rbd_user]
   }
   Concat::Fragment <<| title == 'ceph-client-os' |>>