From d8d40b31663d94eb49e2525e1bb90a1f25515c80 Mon Sep 17 00:00:00 2001 From: Guilhem Lettron Date: Tue, 9 Apr 2013 15:32:17 +0200 Subject: [PATCH] remove useless create file from chef value, read variable, create file, remove file... You forget to fax it --- recipes/osd.rb | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/recipes/osd.rb b/recipes/osd.rb index 9608227..526d083 100644 --- a/recipes/osd.rb +++ b/recipes/osd.rb @@ -73,21 +73,9 @@ else # TODO cluster name cluster = 'ceph' - file "/var/lib/ceph/bootstrap-osd/#{cluster}.keyring.raw" do - owner "root" - group "root" - mode "0440" - content mons[0]["ceph_bootstrap_osd_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-osd/#{cluster}.keyring.raw' - ceph-authtool '/var/lib/ceph/bootstrap-osd/#{cluster}.keyring' --create-keyring --name=client.bootstrap-osd --add-key="$KEY" - rm -f '/var/lib/ceph/bootstrap-osd/#{cluster}.keyring.raw' - EOH + command "ceph-authtool '/var/lib/ceph/bootstrap-osd/#{cluster}.keyring' --create-keyring --name=client.bootstrap-osd --add-key='#{mons[0]["ceph_bootstrap_osd_key"]}'" + creates "/var/lib/ceph/bootstrap-osd/#{cluster}.keyring" end if is_crowbar? -- 2.47.3