From f88948a03e30a40cd29f6ea9eea18e5c6667f659 Mon Sep 17 00:00:00 2001 From: Craig Lewis Date: Thu, 1 Aug 2013 13:19:41 -0700 Subject: [PATCH] Move the ownership of /etc/ceph/ from radosgw.rb to conf.rb --- recipes/conf.rb | 7 +++++++ recipes/radosgw.rb | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes/conf.rb b/recipes/conf.rb index 6480611..a15a2a4 100644 --- a/recipes/conf.rb +++ b/recipes/conf.rb @@ -8,6 +8,13 @@ if node['roles'].include? 'ceph-radosgw' is_rgw = true end +directory "/etc/ceph" do + owner "root" + group "root" + mode "0644" + action :create +end + template '/etc/ceph/ceph.conf' do source 'ceph.conf.erb' variables( diff --git a/recipes/radosgw.rb b/recipes/radosgw.rb index 7447364..d15d98d 100644 --- a/recipes/radosgw.rb +++ b/recipes/radosgw.rb @@ -48,13 +48,6 @@ unless File.exists?("/var/lib/ceph/radosgw/ceph-radosgw.#{node['hostname']}/done include_recipe "ceph::radosgw_#{node["ceph"]["radosgw"]["webserver_companion"]}" end - directory "/etc/ceph" do - owner "root" - group "root" - mode "0644" - action :create - end - ruby_block "create rados gateway client key" do block do keyring = %x[ ceph auth get-or-create client.radosgw.#{node['hostname']} osd 'allow rwx' mon 'allow r' --name mon. --key='#{node["ceph"]["monitor-secret"]}' ] -- 2.47.3