X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fneutron-plugin-plumgrid.yaml;h=bd078074f3b9d855a824fd1f55a9b5625505cad0;hb=cf8c1ebdd3690477b3441559efff82a6b421e90a;hp=484d163ffa94cd82460f680fd73ab9e21bc740b8;hpb=aa71f16a69f063f9a23377271c7cd17a0c4195cc;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/neutron-plugin-plumgrid.yaml b/puppet/services/neutron-plugin-plumgrid.yaml
index 484d163f..bd078074 100644
--- a/puppet/services/neutron-plugin-plumgrid.yaml
+++ b/puppet/services/neutron-plugin-plumgrid.yaml
@@ -1,9 +1,18 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Neutron Plumgrid plugin
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -80,7 +89,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Plumgrid plugin
     value:
-      service_name: neutron-plugin-plumgrid
+      service_name: neutron_plugin_plumgrid
       config_settings:
         neutron::plugins::plumgrid::connection:
           list_join:
@@ -90,7 +99,9 @@ outputs:
               - {get_param: NeutronPassword}
               - '@'
               - {get_param: [EndpointMap, MysqlInternal, host]}
-              - '/ovs_neutron?charset=utf8'
+              - '/ovs_neutron'
+              - '?bind_address='
+              - "%{hiera('tripleo::profile::base::database::mysql::client_bind_address')}"
         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}