openstack/cookbook-openstack-image
Code Issues Proposed changes

sync with rcbops 10/5 ae9c8eb98ad7a995ac36fa57e8fee5e99d56fd05

Browse Source
This commit is contained in:
mattray
2012-10-05 15:36:07 -05:00
parent 31497bd8f5
commit 86036c4156
4 changed files with 78 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
attributes/default.rb
View File

@@ -22,60 +22,61 @@
default["developer_mode"] = false # we want secure passwords by default
########################################################################
default["glance"]["services"]["api"]["scheme"] = "http"
default["glance"]["services"]["api"]["network"] = "public"
default["glance"]["services"]["api"]["port"] = 9292
default["glance"]["services"]["api"]["path"] = "/v1"
default["glance"]["services"]["api"]["scheme"] = "http" # node_attribute
default["glance"]["services"]["api"]["network"] = "public" # node_attribute
default["glance"]["services"]["api"]["port"] = 9292 # node_attribute
default["glance"]["services"]["api"]["path"] = "/v1" # node_attribute
default["glance"]["services"]["registry"]["scheme"] = "http"
default["glance"]["services"]["registry"]["network"] = "public"
default["glance"]["services"]["registry"]["port"] = 9191
default["glance"]["services"]["registry"]["path"] = "/v1"
default["glance"]["services"]["registry"]["scheme"] = "http" # node_attribute
default["glance"]["services"]["registry"]["network"] = "public" # node_attribute
default["glance"]["services"]["registry"]["port"] = 9191 # node_attribute
default["glance"]["services"]["registry"]["path"] = "/v1" # node_attribute
default["glance"]["db"]["name"] = "glance"
default["glance"]["db"]["username"] = "glance"
default["glance"]["db"]["name"] = "glance" # node_attribute
default["glance"]["db"]["username"] = "glance" # node_attribute
# TODO: These may need to be glance-registry specific.. and looked up by glance-api
default["glance"]["service_tenant_name"] = "service"
default["glance"]["service_user"] = "glance"
default["glance"]["service_role"] = "admin"
default["glance"]["api"]["default_store"] = "file"
default["glance"]["api"]["swift"]["store_container"] = "glance"
default["glance"]["api"]["swift"]["store_large_object_size"] = "200"
default["glance"]["api"]["swift"]["store_large_object_chunk_size"] = "200"
default["glance"]["api"]["cache"]["image_cache_max_size"] = "10737418240"
default["glance"]["service_tenant_name"] = "service" # node_attribute
default["glance"]["service_user"] = "glance" # node_attribute
default["glance"]["service_role"] = "admin" # node_attribute
default["glance"]["api"]["default_store"] = "file" # node_attribute
default["glance"]["api"]["swift"]["store_container"] = "glance" # node_attribute
default["glance"]["api"]["swift"]["store_large_object_size"] = "200" # node_attribute
default["glance"]["api"]["swift"]["store_large_object_chunk_size"] = "200" # node_attribute
default["glance"]["api"]["cache"]["image_cache_max_size"] = "10737418240" # node_attribute
# Default Image Locations
default["glance"]["image_upload"] = false
default["glance"]["images"] = [ "cirros" ]
default["glance"]["image"]["precise"] = "http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img"
default["glance"]["image"]["oneiric"] = "http://cloud-images.ubuntu.com/oneiric/current/oneiric-server-cloudimg-amd64-disk1.img"
default["glance"]["image"]["natty"] = "http://cloud-images.ubuntu.com/natty/current/natty-server-cloudimg-amd64-disk1.img"
default["glance"]["image"]["cirros"] = "https://launchpadlibrarian.net/83305348/cirros-0.3.0-x86_64-disk.img"
default["glance"]["image_upload"] = false # node_attribute
default["glance"]["images"] = [ "cirros" ] # node_attribute
default["glance"]["image"]["precise"] = "http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img" # node_attribute
default["glance"]["image"]["oneiric"] = "http://cloud-images.ubuntu.com/oneiric/current/oneiric-server-cloudimg-amd64-disk1.img" # node_attribute
default["glance"]["image"]["natty"] = "http://cloud-images.ubuntu.com/natty/current/natty-server-cloudimg-amd64-disk1.img" # node_attribute
default["glance"]["image"]["cirros"] = "https://launchpadlibrarian.net/83305348/cirros-0.3.0-x86_64-disk.img" # node_attribute
# logging attribute
default["glance"]["syslog"]["use"] = false
default["glance"]["syslog"]["facility"] = "LOG_LOCAL2"
default["glance"]["syslog"]["config_facility"] = "local2"
default["glance"]["syslog"]["use"] = false # node_attribute
default["glance"]["syslog"]["facility"] = "LOG_LOCAL2" # node_attribute
default["glance"]["syslog"]["config_facility"] = "local2" # node_attribute
# platform-specific settings
case platform
when "fedora", "redhat", "centos"
default["glance"]["platform"] = {
"mysql_python_packages" => [ "MySQL-python" ],
"glance_packages" => [ "openstack-glance", "openstack-swift" ],
"glance_api_service" => "openstack-glance-api",
"glance_registry_service" => "openstack-glance-registry",
"glance_api_process_name" => "glance-api",
"package_overrides" => ""
"mysql_python_packages" => [ "MySQL-python" ], # node_attribute
"glance_packages" => [ "openstack-glance", "openstack-swift", "cronie" ], # node_attribute
"glance_api_service" => "openstack-glance-api", # node_attribute
"glance_registry_service" => "openstack-glance-registry", # node_attribute
"glance_api_process_name" => "glance-api", # node_attribute
"package_overrides" => "" # node_attribute
}
when "ubuntu"
default["glance"]["platform"] = {
"mysql_python_packages" => [ "python-mysqldb" ],
"glance_packages" => [ "glance", "python-swift" ],
"glance_api_service" => "glance-api",
"glance_registry_service" => "glance-registry",
"glance_registry_process_name" => "glance-registry",
"package_overrides" => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'"
"mysql_python_packages" => [ "python-mysqldb" ], # node_attribute
"glance_packages" => [ "glance", "python-swift" ], # node_attribute
"glance_api_service" => "glance-api", # node_attribute
"glance_registry_service" => "glance-registry", # node_attribute
"glance_registry_process_name" => "glance-registry", # node_attribute
"package_overrides" => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'" # node_attribute
}
end

2
metadata.rb
View File

@@ -1,6 +1,6 @@
maintainer "Opscode, Inc."
license "Apache 2.0"
description "The Glance Image Registry and Delivery Service Glance"
description "Installs and configures the Glance Image Registry and Delivery Service"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version "5.0.0"
recipe "glance::api", "Installs packages required for a glance api server"

41
recipes/api.rb
View File

@@ -237,11 +237,42 @@ if node["glance"]["image_upload"]
user "root"
environment ({"OS_USERNAME" => keystone_admin_user,
"OS_PASSWORD" => keystone_admin_password,
"OS_TENANT_NAME" => keystone_tenant,
"OS_AUTH_URL" => ks_admin_endpoint["uri"]})
code <<-EOH
glance --silent-upload add name="#{img.to_s}-image" is_public=true container_format=bare disk_format=qcow2 location="#{node["glance"]["image"][img]}"
EOH
"OS_TENANT_NAME" => keystone_tenant,
"OS_AUTH_URL" => ks_admin_endpoint["uri"]})
case File.extname(node["glance"]["image"][img.to_sym])
when ".gz", ".tgz"
code <<-EOH
set -e
set -x
mkdir -p images/#{img.to_s}
cd images/#{img.to_s}
curl -L #{node["glance"]["image"][img.to_sym]} | tar -zx
image_name=$(basename #{node["glance"]["image"][img]} .tar.gz)
image_name=${image_name%-multinic}
kernel_file=$(ls *vmlinuz-virtual | head -n1)
if [ ${#kernel_file} -eq 0 ]; then
kernel_file=$(ls *vmlinuz | head -n1)
fi
ramdisk=$(ls *-initrd | head -n1)
if [ ${#ramdisk} -eq 0 ]; then
ramdisk=$(ls *-loader | head -n1)
fi
kernel=$(ls *.img | head -n1)
kid=$(glance --silent-upload add name="${image_name}-kernel" is_public=true disk_format=aki container_format=aki < ${kernel_file} | cut -d: -f2 | sed 's/ //')
rid=$(glance --silent-upload add name="${image_name}-initrd" is_public=true disk_format=ari container_format=ari < ${ramdisk} | cut -d: -f2 | sed 's/ //')
glance --silent-upload add name="#{img.to_s}-image" is_public=true disk_format=ami container_format=ami kernel_id=$kid ramdisk_id=$rid < ${kernel}
EOH
when ".img", ".qcow2"
code <<-EOH
glance --silent-upload add name="#{img.to_s}-image" is_public=true container_format=bare disk_format=qcow2 location="#{node["glance"]["image"][img]}"
EOH
end
not_if "glance -f -I #{keystone_admin_user} -K #{keystone_admin_password} -T #{keystone_tenant} -N #{ks_admin_endpoint["uri"]} index | grep #{img.to_s}-image"
end
end

1
templates/default/glance-api.conf.erb
View File

@@ -140,6 +140,7 @@ filesystem_store_datadir = /var/lib/glance/images/
# ============ Swift Store Options =============================
# Address where the Swift authentication service lives
# Valid schemes are 'http://' and 'https://'
# If no scheme specified, default to 'https://'