openstack/cookbook-openstack-compute
Code Issues Proposed changes

Merge pull request #41 from jaypipes/working

Browse Source 
Need space between version in depends
This commit is contained in:
John Dewey
2013-01-03 19:29:04 -08:00
parent 0899a0cdc9 2a00dd2116
commit 852a20327f
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
metadata.rb
View File

@@ -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"

9
recipes/api-os-compute.rb
View File

@@ -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"]

4
recipes/nova-common.rb
View File

@@ -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)