From 2aeb9c1992b4c69b7cc77a58c5ff65a27ced09fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Charlier?= <francois.charlier@enovance.com>
Date: Thu, 24 Jul 2014 16:30:41 +0200
Subject: [PATCH] ceph keys dependencies: use correct syntax for
 ensure_resource

---
 manifests/compute/hypervisor.pp | 21 +++++++++++++--------
 manifests/volume/backend/rbd.pp | 16 +++++++++-------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp
index 65840dec..621a21be 100644
--- a/manifests/compute/hypervisor.pp
+++ b/manifests/compute/hypervisor.pp
@@ -193,14 +193,19 @@ Host *
     })
 
     # Configure Ceph keyring
-    Ceph::Key <<| title == $cinder_rbd_user |>> ->
-    ensure_resource('file', "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring", {
-      owner   => 'root',
-      group   => 'cephkeyring',
-      mode    => '0440',
-      require => Ceph::Key[$cinder_rbd_user],
-      notify  => Service['nova-compute'],
-    })
+    Ceph::Key <<| title == $cinder_rbd_user |>>
+    if defined(Ceph::Key[$cinder_rbd_user]) {
+      ensure_resource(
+        'file',
+        "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring", {
+          owner   => 'root',
+          group   => 'cephkeyring',
+          mode    => '0440',
+          require => Ceph::Key[$cinder_rbd_user],
+          notify  => Service['nova-compute'],
+        }
+      )
+    }
 
     Concat::Fragment <<| title == 'ceph-client-os' |>>
   } else {
diff --git a/manifests/volume/backend/rbd.pp b/manifests/volume/backend/rbd.pp
index db2416f7..04392b06 100644
--- a/manifests/volume/backend/rbd.pp
+++ b/manifests/volume/backend/rbd.pp
@@ -84,13 +84,15 @@ define cloud::volume::backend::rbd (
   })
 
   # Configure Ceph keyring
-  Ceph::Key <<| title == $rbd_user |>> ->
-  ensure_resource('file', "/etc/ceph/ceph.client.${rbd_user}.keyring", {
-    owner   => 'root',
-    group   => 'cephkeyring',
-    mode    => '0440',
-    require => Ceph::Key[$rbd_user],
-  })
+  Ceph::Key <<| title == $rbd_user |>>
+  if defined(Ceph::Key[$rbd_user]) {
+    ensure_resource('file', "/etc/ceph/ceph.client.${rbd_user}.keyring", {
+      owner   => 'root',
+      group   => 'cephkeyring',
+      mode    => '0440',
+      require => Ceph::Key[$rbd_user],
+      })
+  }
 
   Concat::Fragment <<| title == 'ceph-client-os' |>>