x/compass-adapters
Code Issues Proposed changes

Change image create method from pull from remote to local

Browse Source 
For nodes without internet access, image create from remote location
does not work, so have to create image file from source location first
by chef-client with http_proxy and then upload the image to glance from
the downloaded file.

Change-Id: Ic0c0474dac1aae815e5ab8f6914a3f7aa3411908
This commit is contained in:
Xinyu Zhao 2014-03-27 00:46:59 +00:00
parent 66177e0196
commit bff928462f
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}"
c_fmt = "--container-format bare"
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
cwd "/tmp"
command "#{glance_cmd} image-create --name #{name} --is-public true #{c_fmt} #{d_fmt} --location #{url}"
cwd Chef::Config[:file_cache_path]
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}"
end
end
@ -99,9 +104,12 @@ def _upload_ami(name, url)
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/ //')
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}
kid=$(#{glance_cmd} image-create --name "${image_name}-kernel" --is-public true \
#{aki_fmt} < ${kernel_file} | cut -d: -f2 | sed 's/ //')
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
not_if "#{glance_cmd} image-list | grep #{name.to_s}"
end