openstack/openstack-chef-repo
Code Issues Proposed changes

create os-image-upload role and change the order of

Browse Source 
os-image-api and os-image-registry roles.

Create a new role os-image-upload and change the execution order of
os-image-api and os-image-registry roles in os-image role to make sure
the os-image-api role is executed before os-image-registry role since
glance db_sync use the sql_connection value in
/etc/glance/glance-api.conf.
Add os-image-upload to infrastructure.yml.
Remove the image_upload attribute from environments.

Change-Id: I218b52e1fd0ca68849e6aebd8bac6d8878790fba
Closes-Bug: #1257169
This commit is contained in:
Eric Zhou 2013-12-03 22:10:00 +08:00
parent c2a6122c51
commit 61df5913c2
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
environments/example.rb
View File

@ -10,7 +10,6 @@ override_attributes(
"developer_mode" => true "developer_mode" => true
} }
# "glance" => { # "glance" => {
# "image_upload" => true,
# "images" => ["precise","cirros"], # "images" => ["precise","cirros"],
# "image" => { # "image" => {
# "cirros" => "http://hypnotoad/cirros-0.3.0-x86_64-disk.img", # "cirros" => "http://hypnotoad/cirros-0.3.0-x86_64-disk.img",

1
environments/testing.rb
View File

@ -221,7 +221,6 @@ override_attributes(
}, },
"debug" => true, "debug" => true,
"identity_service_chef_role" => "os-identity", "identity_service_chef_role" => "os-identity",
"image_upload" => true,
"rabbit_server_chef_role" => "os-ops-messaging", "rabbit_server_chef_role" => "os-ops-messaging",
"registry" => { "registry" => {
"bind_interface" => "eth0" "bind_interface" => "eth0"

1
environments/vagrant.rb
View File

@ -14,7 +14,6 @@ override_attributes(
}, },
}, },
"image" => { "image" => {
"image_upload" => true,
"upload_images" => ["cirros"], "upload_images" => ["cirros"],
"upload_image" => { "upload_image" => {
"cirros" => "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img" "cirros" => "https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img"

1
infrastructure.yml
View File

@ -29,6 +29,7 @@ roles:
- os-image: - os-image:
- os-image-api: - os-image-api:
- os-image-registry: - os-image-registry:
- os-image-upload:
- os-metering-agent-central: - os-metering-agent-central:
- os-metering-agent-compute: - os-metering-agent-compute:
- os-metering-api: - os-metering-api:

6
roles/os-image-upload.rb Normal file
View File

@ -0,0 +1,6 @@
name "os-image-upload"
description "Glance image upload"
run_list(
"role[os-base]",
"recipe[openstack-image::image_upload]"
)

4
roles/os-image.rb
View File

@ -2,6 +2,6 @@ name "os-image"
description "Roll-up role for Glance." description "Roll-up role for Glance."
run_list( run_list(
"recipe[openstack-image::identity_registration]", "recipe[openstack-image::identity_registration]",
"role[os-image-registry]", "role[os-image-api]",
"role[os-image-api]" "role[os-image-registry]"
) )