From 03baab722721afafa5763bf91693c2adb672a11c Mon Sep 17 00:00:00 2001 From: John Dewey Date: Mon, 26 Nov 2012 11:53:31 -0800 Subject: [PATCH] Using #endpoint vs now deprecated #endpoint_uri --- recipes/api.rb | 8 ++++---- recipes/registry.rb | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes/api.rb b/recipes/api.rb index bfaa42d..0f11ae3 100644 --- a/recipes/api.rb +++ b/recipes/api.rb @@ -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 diff --git a/recipes/registry.rb b/recipes/registry.rb index bdb664e..b02f18d 100644 --- a/recipes/registry.rb +++ b/recipes/registry.rb @@ -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