From: Walter  Huf <walter.huf@corvisa.com>
Date: Wed, 19 Mar 2014 13:24:13 +0000 (-0500)
Subject: Moves the lwrp file block out of the converge_by block
X-Git-Tag: v0.8.0~52^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2df193381421e17e87695d9093f7bc80a98b39b6;p=ceph-cookbooks.git

Moves the lwrp file block out of the converge_by block
---

diff --git a/providers/client.rb b/providers/client.rb
index 98bf333..e176365 100644
--- a/providers/client.rb
+++ b/providers/client.rb
@@ -12,28 +12,20 @@ action :add do
   owner = @new_resource.owner
   group = @new_resource.group
   mode = @new_resource.mode
-  if ! @current_resource.caps_match
+  unless @current_resource.caps_match
     converge_by("Set caps for #{@new_resource}") do
       auth_set_key(keyname, caps)
       current_resource.key = get_key(keyname)
 
-      # update the key in the file
-      file filename do
-        content file_content
-        owner owner
-        group group
-        mode mode
-      end
-    end
-  else
-    # make sure the file matches what the cluster thinks
-    file filename do
-      content file_content
-      owner owner
-      group group
-      mode mode
     end
   end
+  # update the key in the file
+  file filename do
+    content file_content
+    owner owner
+    group group
+    mode mode
+  end
 
 end