diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-29 14:43:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-29 14:43:58 +0000 |
| commit | 7a3b6c68e61919cb2818e9e21c0734ff3a8a6c36 (patch) | |
| tree | 7af609cbf95b97ffada1c11f057fd658735cd371 /puppet | |
| parent | 4070a03cb41fd84530591a8774f66fa05c7900bf (diff) | |
| parent | fa875461cd9ff16ddfd6f713b5cd9a36fefd7e1e (diff) | |
Merge "Stop passing charset=utf8 for neutron database connection option"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/neutron-plugin-plumgrid.yaml | 2 | ||||
| -rw-r--r-- | 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 5ae699d5..5488bed7 100644 --- a/puppet/services/neutron-plugin-plumgrid.yaml +++ b/puppet/services/neutron-plugin-plumgrid.yaml @@ -90,7 +90,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 017fbea4..1c7cef49 100644 --- a/puppet/services/neutron-server.yaml +++ b/puppet/services/neutron-server.yaml @@ -51,7 +51,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::auth_tenant: 'service' |