From 6c4cf7d9173ed96da2328dba2adcafec4ba34037 Mon Sep 17 00:00:00 2001 From: Jay Pipes Date: Thu, 3 Jan 2013 15:57:40 -0500 Subject: [PATCH 1/2] Need space between version in depends --- metadata.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.rb b/metadata.rb index db814ffb..6c240bbb 100644 --- a/metadata.rb +++ b/metadata.rb @@ -27,7 +27,7 @@ depends "glance" depends "keystone" depends "mysql" depends "openstack-utils" -depends "openstack-common", ">=0.1.4" +depends "openstack-common", ">= 0.1.4" depends "rabbitmq" depends "selinux" depends "sysctl" From 2a00dd21160c691975fc17d6d4fbabc2f7afd847 Mon Sep 17 00:00:00 2001 From: Jay Pipes Date: Thu, 3 Jan 2013 22:26:09 -0500 Subject: [PATCH 2/2] Couple tiny things found on debugging in CI --- recipes/api-os-compute.rb | 9 ++++----- recipes/nova-common.rb | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) 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)