Merge "Stop passing charset=utf8 for neutron database connection option"

diff --cc puppet/services/neutron-plugin-plumgrid.yaml
Simple merge

diff --cc puppet/services/neutron-server.yaml
index 017fbea,b84958c..1c7cef4
--- 1/puppet/services/neutron-server.yaml
--- 2/puppet/services/neutron-server.yaml
+++ b/puppet/services/neutron-server.yaml
@@@ -51,11 -50,11 +51,11 @@@ 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::auth_tenant: 'service'
              neutron::server::identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
 -            neutron::server::database_connection: *neutron_dsn
              neutron::server::api_workers: {get_param: NeutronWorkers}
              neutron::server::allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
              neutron::server::l3_ha: {get_param: NeutronL3HA}