From 0c36e002de4574bf0ceb6615ce81a749579fd17e Mon Sep 17 00:00:00 2001 From: Walter Huf Date: Tue, 6 Jan 2015 00:03:37 -0600 Subject: [PATCH 1/2] Installs radosgw_apache first to add the system user --- recipes/radosgw.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/radosgw.rb b/recipes/radosgw.rb index 0a5bb0d..8f3ea4d 100644 --- a/recipes/radosgw.rb +++ b/recipes/radosgw.rb @@ -23,6 +23,10 @@ include_recipe 'ceph::radosgw_install' include_recipe 'ceph::conf' +if node['ceph']['radosgw']['webserver_companion'] + include_recipe "ceph::radosgw_#{node['ceph']['radosgw']['webserver_companion']}" +end + directory '/var/log/radosgw' do owner node['apache']['user'] group node['apache']['group'] @@ -42,10 +46,6 @@ action :create end -if node['ceph']['radosgw']['webserver_companion'] - include_recipe "ceph::radosgw_#{node['ceph']['radosgw']['webserver_companion']}" -end - ceph_client 'radosgw' do caps('mon' => 'allow rw', 'osd' => 'allow rwx') owner 'root' From 987221db50b07bf480e4441173ae1a129f743bc3 Mon Sep 17 00:00:00 2001 From: Walter Huf Date: Tue, 6 Jan 2015 00:04:03 -0600 Subject: [PATCH 2/2] Adds yum-priorities to force packages from ceph repo --- recipes/rpm.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/rpm.rb b/recipes/rpm.rb index a2708ef..828688f 100644 --- a/recipes/rpm.rb +++ b/recipes/rpm.rb @@ -10,14 +10,18 @@ fail "Dev branch for #{platform_family} is not yet supported" end +package 'yum-priorities' + yum_repository 'ceph' do baseurl node['ceph'][platform_family][branch]['repository'] gpgkey node['ceph'][platform_family][branch]['repository_key'] + priority '10' end yum_repository 'ceph-extra' do baseurl node['ceph'][platform_family]['extras']['repository'] gpgkey node['ceph'][platform_family]['extras']['repository_key'] + priority '10' only_if { node['ceph']['extras_repo'] } end