openstack
/
cookbook-openstack-telemetry
Code Issues Proposed changes

setting the utf8 charset manually for mysql no longer required 

this is now done by the db_uri library method in
openstack-common/libraries/endpoints.rb

Change-Id: I93c5ac383fb870eb1604cf68b200a564100663a3
This commit is contained in:
Ionuț Arțăriși 2013-12-09 16:35:55 +01:00
parent 6ab2050905
commit 461f3102d0
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes/common.rb
View File

@ -36,11 +36,9 @@ if node["openstack"]["metering"]["mq"]["service_type"] == "rabbitmq"
rabbit_pass = user_password node["openstack"]["metering"]["rabbit"]["username"]
end
db_info = db "metering"
db_user = node["openstack"]["metering"]["db"]["username"]
db_pass = db_password "ceilometer"
db_query = db_info["db_type"] == "mysql" ? "?charset=utf8" : ""
db_uri = db_uri("metering", db_user, db_pass).to_s + db_query
db_uri = db_uri("metering", db_user, db_pass).to_s
service_user = node["openstack"]["metering"]["service_user"]
service_pass = service_password "openstack-compute"