x/compass-adapters
Code Issues Proposed changes

Add local repo support for ceph related recipes

Browse Source 
Change-Id: Ide2efc20a576be5686e8089cd307e69900752209
This commit is contained in:
Xicheng Chang 2014-10-07 14:02:28 -07:00
parent b327ac4bad
commit 780d826a1a
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chef/cookbooks/mysql/recipes/ruby.rb
View File

@ -44,7 +44,7 @@ node['mysql']['client']['packages'].each do |name|
resources("package[#{name}]").run_action(:install)
end
if node['local_repo'].nil? or node['local_repo'] == ""
if node['local_repo'].nil? or node['local_repo'].empty?
chef_gem 'mysql'
else
gem_package 'mysql' do

3
chef/cookbooks/openstack-compute/recipes/compute-config-ceph.rb
View File

@ -38,6 +38,9 @@ if node['openstack']['block-storage']['volume']['driver'] == 'cinder.volume.driv
end
end
unless node['local_repo'].nil? or node['local_repo'].empty?
node.override['ceph']['rhel']['extras']['repository'] = "#{node['local_repo']}/compass_repo"
execute "rpm -Uvh --force #{node['ceph']['rhel']['extras']['repository']}/qemu-kvm-0.12.1.2-2.415.el6.3ceph.x86_64.rpm #{node['ceph']['rhel']['extras']['repository']}/qemu-img-0.12.1.2-2.415.el6.3ceph.x86_64.rpm" do
not_if "rpm -qa | grep qemu | grep ceph"
end

2
chef/cookbooks/openstack-image/recipes/image_upload.rb
View File

@ -26,7 +26,7 @@ if node['openstack']['image']['syslog']['use']
include_recipe 'openstack-common::logging'
end
unless node['local_repo'].nil? or node['local_repo'] == ""
unless node['local_repo'].nil? or node['local_repo'].empty?
node.override['openstack']['image']['upload_image']['cirros'] = "#{node['local_repo']}/cirros-0.3.2-x86_64-disk.img"
end

2
chef/cookbooks/yum/providers/repository.rb
View File

@ -31,7 +31,7 @@ def whyrun_supported?
end
action :create do
if node['local_repo'].nil? or node['local_repo'] == ""
if node['local_repo'].nil? or node['local_repo'].empty?
# Hack around the lack of "use_inline_resources" before Chef 11 by
# uniquely naming the execute[yum-makecache] resources. Set the
# notifies timing to :immediately for the same reasons. Remove both