diff --git a/recipes/api-os-compute.rb b/recipes/api-os-compute.rb
index c02dbef1..e89a0a8e 100644
--- a/recipes/api-os-compute.rb
+++ b/recipes/api-os-compute.rb
@@ -81,11 +81,10 @@ end
 
 # Register Service User
 keystone_register "Register Service User" do
-  auth_host identity_admin_endpoint.host
-  auth_port identity_admin_endpoint.port.to_s
-  auth_protocol identity_admin_endpoint.scheme
-  api_ver identity_admin_endpoint.path
-  auth_token keystone["admin_token"]
+  auth_uri auth_uri
+  admin_tenant_name ksadmin_tenant_name
+  admin_user ksadmin_user
+  admin_password ksadmin_pass
   tenant_name node["nova"]["service_tenant_name"]
   user_name node["nova"]["service_user"]
   user_pass node["nova"]["service_pass"]
diff --git a/recipes/nova-common.rb b/recipes/nova-common.rb
index 559e02c1..ccad6040 100644
--- a/recipes/nova-common.rb
+++ b/recipes/nova-common.rb
@@ -63,9 +63,9 @@ directory node["nova"]["api"]["signing_dir"] do
 end
 
 rabbit_server_role = node["nova"]["rabbit_server_chef_role"]
-rabbit_info = get_settings_by_role rabbit_server_role, "queue"
+rabbit_info = config_by_role rabbit_server_role, "queue"
 
-db_user = nova_db_info['db']['username']
+db_user = node['nova']['db']['username']
 db_pass = db_password "nova"
 sql_connection = db_uri("compute", db_user, db_pass)