Browse Source

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
Ionuț Arțăriși 5 years ago
parent
commit
461f3102d0
1 changed files with 1 additions and 3 deletions
  1. 1
    3
      recipes/common.rb

+ 1
- 3
recipes/common.rb View File

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

Loading…
Cancel
Save