x/compass-adapters
Code Issues Proposed changes

Merge "Change image create method from pull from remote to local"

Browse Source
This commit is contained in:
Jenkins 2014-03-27 18:46:14 +00:00 committed by Gerrit Code Review
commit bacae2581f
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
chef/cookbooks/openstack-image/files/default/images/cirros-0.3.1-i386-disk.img
View File

Binary file not shown.

BIN
chef/cookbooks/openstack-image/files/default/images/cirros-0.3.1-x86_64-disk.img
View File

Binary file not shown.

20
chef/cookbooks/openstack-image/providers/image.rb
View File

@ -59,10 +59,15 @@ def _upload_qcow(name, url)
glance_cmd = "glance --insecure -I #{@user} -K #{@pass} -T #{@tenant} -N #{@ks_uri}" glance_cmd = "glance --insecure -I #{@user} -K #{@pass} -T #{@tenant} -N #{@ks_uri}"
c_fmt = "--container-format bare" c_fmt = "--container-format bare"
d_fmt = "--disk-format qcow2" d_fmt = "--disk-format qcow2"
img_file_name = ::File.basename(url)
remote_file "#{Chef::Config[:file_cache_path]}/#{img_file_name}" do
source "#{url}"
action :create_if_missing
end
execute "Uploading QCOW2 image #{name}" do execute "Uploading QCOW2 image #{name}" do
cwd "/tmp" cwd Chef::Config[:file_cache_path]
command "#{glance_cmd} image-create --name #{name} --is-public true #{c_fmt} #{d_fmt} --location #{url}" command "#{glance_cmd} image-create --name #{name} \
--is-public true #{c_fmt} #{d_fmt} < #{img_file_name}"
not_if "#{glance_cmd} image-list | grep #{name.to_s}" not_if "#{glance_cmd} image-list | grep #{name.to_s}"
end end
end end
@ -99,9 +104,12 @@ def _upload_ami(name, url)
kernel=$(ls *.img | head -n1) kernel=$(ls *.img | head -n1)
kid=$(#{glance_cmd} image-create --name "${image_name}-kernel" --is-public true #{aki_fmt} < ${kernel_file} | cut -d: -f2 | sed 's/ //') kid=$(#{glance_cmd} image-create --name "${image_name}-kernel" --is-public true \
rid=$(#{glance_cmd} image-create --name "${image_name}-initrd" --is-public true #{ari_fmt} < ${ramdisk} | cut -d: -f2 | sed 's/ //') #{aki_fmt} < ${kernel_file} | cut -d: -f2 | sed 's/ //')
#{glance_cmd} image-create --name "#{name}" --is-public true #{ami_fmt} --property "kernel_id=$kid" --property "ramdisk_id=$rid" < ${kernel} rid=$(#{glance_cmd} image-create --name "${image_name}-initrd" --is-public true \
#{ari_fmt} < ${ramdisk} | cut -d: -f2 | sed 's/ //')
#{glance_cmd} image-create --name "#{name}" --is-public true #{ami_fmt} \
--property "kernel_id=$kid" --property "ramdisk_id=$rid" < ${kernel}
EOH EOH
not_if "#{glance_cmd} image-list | grep #{name.to_s}" not_if "#{glance_cmd} image-list | grep #{name.to_s}"
end end