openstack/cookbook-openstack-image
Code Issues Proposed changes

Resolve merge conflicts

Browse Source
This commit is contained in:
Jay Pipes
2012-10-10 10:24:08 -04:00
parent ba82c4a1b2 bdfc6f8187
commit cfc5e16f9b
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -99,6 +99,8 @@ Attributes
* `glance["verbose"]` - Enables/disables verbose output for glance services.
* `glance["debug"]` - Enables/disables debug output for glance services.
* `glance["keystone_service_chef_role"]` - The name of the Chef role that installs the Keystone Service API
* `glance["glance_api_chef_role"]` - The name of the Chef role that installs the Glance API service
* `glance["db"]["name"]` - Name of glance database
* `glance["db"]["user"]` - Username for glance database access
* `glance["db"]["password"]` - Password for glance database access
@@ -117,7 +119,7 @@ Attributes
* `glance["service_role"]` - User role used by glance when interacting with keystone - used in the API and registry paste.ini files
* `glance["image_upload"]` - Toggles whether to automatically upload images in the `glance["images"]` array
* `glance["images"]` - Default list of images to upload to the glance repository as part of the install
* `glance["image]["<imagename>"]` - URL location of the <imagename> image. There can be multiple instances of this line to define multiple imagess (eg natty, maverick, fedora17 etc)
* `glance["image]["<imagename>"]` - URL location of the `<imagename>` image. There can be multiple instances of this line to define multiple imagess (eg natty, maverick, fedora17 etc)
--- example `glance["image]["natty"]` - "http://c250663.r63.cf1.rackcdn.com/ubuntu-11.04-server-uec-amd64-multinic.tar.gz"
* `glance["api"]["default_store"]` - Toggles the backend storage type. Currently supported is "file" and "swift"
* `glance["api"]["swift"]["store_container"] - Set the container used by glance to store images and snapshots. Defaults to "glance"

5
attributes/default.rb
View File

@@ -24,6 +24,11 @@ default["developer_mode"] = false # we want secure passwords by default
default["glance"]["verbose"] = "False"
default["glance"]["debug"] = "False"
# This is the name of the Chef role that will install the Keystone Service API
default["glance"]["keystone_service_chef_role"] = "keystone"
# This is the name of the Chef role that will install the Glance API service
default["glance"]["glance_api_chef_role"] = "glance-api"
default["glance"]["services"]["api"]["scheme"] = "http" # node_attribute
default["glance"]["services"]["api"]["network"] = "public" # node_attribute

4
recipes/api.rb
View File

@@ -63,8 +63,8 @@ rabbit_info = get_settings_by_role("rabbitmq-server", "rabbitmq") # FIXME: acces
ks_admin_endpoint = get_access_endpoint("keystone", "keystone", "admin-api")
ks_service_endpoint = get_access_endpoint("keystone", "keystone","service-api")
keystone = get_settings_by_role("keystone", "keystone")
glance = get_settings_by_role("glance-api", "glance")
keystone = get_settings_by_role(node["glance"]["keystone_service_chef_role"], "keystone")
glance = get_settings_by_role(node["glance"]["glance_api_chef_role"], "glance")
registry_endpoint = get_access_endpoint("glance-registry", "glance", "registry")
api_endpoint = get_bind_endpoint("glance", "api")

2
recipes/registry.rb
View File

@@ -39,7 +39,7 @@ end
ks_admin_endpoint = get_access_endpoint("keystone", "keystone", "admin-api")
ks_service_endpoint = get_access_endpoint("keystone", "keystone", "service-api")
keystone = get_settings_by_role("keystone", "keystone")
keystone = get_settings_by_role(node["glance"]["keystone_service_chef_role"], "keystone")
registry_endpoint = get_bind_endpoint("glance", "registry")