openstack
/
cookbook-openstack-image
Code Issues Proposed changes

Merge pull request #8 from retr0h/working 

Using #endpoint vs now deprecated #endpoint_uri
This commit is contained in:
jaypipes 2012-11-26 13:01:22 -08:00
parent 5dc103217c 03baab7227
commit 3fe44be7fd
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
recipes/api.rb
View File

@ -70,13 +70,13 @@ rabbit_info = get_settings_by_role rabbit_server_role, "queue"
keystone_service_role = node["glance"]["keystone_service_chef_role"]
keystone = get_settings_by_role keystone_service_role, "keystone"
identity_admin_endpoint = endpoint_uri "identity-admin"
identity_endpoint = endpoint_uri "identity-api"
identity_admin_endpoint = endpoint "identity-admin"
identity_endpoint = endpoint "identity-api"
glance = get_settings_by_role node["glance"]["glance_api_chef_role"], "glance"
registry_endpoint = endpoint_uri "image-registry"
api_endpoint = endpoint_uri "image-api"
registry_endpoint = endpoint "image-registry"
api_endpoint = endpoint "image-api"
# Possible combinations of options here
# - default_store=file

6
recipes/registry.rb
View File

@ -31,8 +31,8 @@ package "python-keystone" do
action :install
end
identity_admin_endpoint = endpoint_uri "identity-admin"
identity_endpoint = endpoint_uri "identity-api"
identity_admin_endpoint = endpoint "identity-admin"
identity_endpoint = endpoint "identity-api"
db_user = node["glance"]["db"]["username"]
db_pass = node["glance"]["db"]["password"]
@ -40,7 +40,7 @@ sql_connection = db_uri("image", db_user, db_pass)
keystone = get_settings_by_role node["glance"]["keystone_service_chef_role"], "keystone"
registry_endpoint = endpoint_uri "image-registry"
registry_endpoint = endpoint "image-registry"
package "curl" do
action :install