only create the bootstrap_client keyring once

diff --git a/recipes/bootstrap_client.rb b/recipes/bootstrap_client.rb
index a55c68c16ce099496c3dd5cff01788638a55a2fc..be8a2a87ba633a3f8145de7363c7a316de60ebac 100644 (file)
--- a/recipes/bootstrap_client.rb
+++ b/recipes/bootstrap_client.rb
@@ -18,20 +18,13 @@ else
   #TODO cluster name
   cluster = 'ceph'
 
-  file "/var/lib/ceph/bootstrap-client/#{cluster}.keyring.raw" do
-    owner "root"
-    group "root"
-    mode "0440"
-    content mons[0]["ceph_bootstrap_client_key"]
-  end
-
   execute "format as keyring" do
     command <<-EOH
       set -e
       # TODO don't put the key in "ps" output, stdout
-      read KEY <'/var/lib/ceph/bootstrap-client/#{cluster}.keyring.raw'
-      ceph-authtool '/var/lib/ceph/bootstrap-client/#{cluster}.keyring' --create-keyring --name=client.bootstrap-client --add-key="$KEY"
+      ceph-authtool '/var/lib/ceph/bootstrap-client/#{cluster}.keyring' --create-keyring --name=client.bootstrap-client --add-key='#{mons[0]["ceph_bootstrap_client_key"]}'
       rm -f '/var/lib/ceph/bootstrap-client/#{cluster}.keyring.raw'
     EOH
+    creates 'var/lib/ceph/bootstrap-client/#{cluster}.keyring'
   end
 end