From fa875461cd9ff16ddfd6f713b5cd9a36fefd7e1e Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 16 Jun 2016 13:56:00 +0200 Subject: Stop passing charset=utf8 for neutron database connection option This option belongs to oslo.db, and oslo.db enforces UTF-8 for client connections since I676c9c5e418905160e4ab647b8a0f2fb601e8962 that is included since Kilo. Neutron switched to the library in Kilo too (I1ccf896922a5a762d37a1a3b93c56c8b8ae8c085). I guess it's time to remove this hardcoded charset and allow oslo.db to do the right thing. Change-Id: I7d6ffa734374aeaf6fa6a7d98048bbbdfbeb412a --- puppet/services/neutron-plugin-plumgrid.yaml | 2 +- puppet/services/neutron-server.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/puppet/services/neutron-plugin-plumgrid.yaml b/puppet/services/neutron-plugin-plumgrid.yaml index a0ac46ef..68766674 100644 --- a/puppet/services/neutron-plugin-plumgrid.yaml +++ b/puppet/services/neutron-plugin-plumgrid.yaml @@ -89,7 +89,7 @@ outputs: - {get_param: NeutronPassword} - '@' - {get_param: [EndpointMap, MysqlInternal, host]} - - '/ovs_neutron?charset=utf8' + - '/ovs_neutron' neutron::plugins::plumgrid::controller_priv_host: {get_param: [EndpointMap, KeystoneAdmin, host]} neutron::plugins::plumgrid::admin_password: {get_param: AdminPassword} neutron::plugins::plumgrid::metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret} diff --git a/puppet/services/neutron-server.yaml b/puppet/services/neutron-server.yaml index 6299c39e..b84958cd 100644 --- a/puppet/services/neutron-server.yaml +++ b/puppet/services/neutron-server.yaml @@ -50,7 +50,7 @@ outputs: - {get_param: NeutronPassword} - '@' - {get_param: [EndpointMap, MysqlInternal, host]} - - '/ovs_neutron?charset=utf8' + - '/ovs_neutron' neutron::server::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } neutron::server::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} neutron::server::identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] } -- cgit 1.2.3-korg