From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 29 Jul 2016 14:43:58 +0000 (+0000)
Subject: Merge "Stop passing charset=utf8 for neutron database connection option"
X-Git-Tag: opnfv-6.0.0~1810
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7a3b6c68e61919cb2818e9e21c0734ff3a8a6c36;p=apex-tripleo-heat-templates.git

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

7a3b6c68e61919cb2818e9e21c0734ff3a8a6c36
diff --cc puppet/services/neutron-server.yaml
index 017fbea4,b84958cd..1c7cef49
--- a/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}