X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fneutron-plugin-nuage.yaml;h=e09cd704401fae7b68947375b161c58b57967f8f;hb=489761e848ad4be0eb67bc405968ef2870b81f05;hp=3889f84af3a09dfd5e7522a08e7e505c0332f1b0;hpb=f00ed98048a1a24e55dfea64171771ff73216335;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/neutron-plugin-nuage.yaml b/puppet/services/neutron-plugin-nuage.yaml
index 3889f84a..e09cd704 100644
--- a/puppet/services/neutron-plugin-nuage.yaml
+++ b/puppet/services/neutron-plugin-nuage.yaml
@@ -1,9 +1,18 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Neutron Nuage 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
@@ -54,12 +63,16 @@ resources:
 
   NeutronBase:
     type: ./neutron-base.yaml
+    properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Neutron Nuage plugin
     value:
-      service_name: neutron-plugin-nuage
+      service_name: neutron_plugin_nuage
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]