Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions recipes/radosgw.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand All @@ -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'
Expand Down
4 changes: 4 additions & 0 deletions recipes/rpm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down