X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fneutron-compute-plugin-opencontrail.yaml;h=bbe4a051cdbad61e6665bc450cabe01c1edc38f8;hb=2dee58a85abd3e2e653d52f41ccf155c17681c62;hp=b95a6554031135d59ef81aef6afd2ce5b5f78203;hpb=fcf132079f5120d3eed6a786bd3dfa9ab87d3a3a;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/neutron-compute-plugin-opencontrail.yaml b/puppet/services/neutron-compute-plugin-opencontrail.yaml
index b95a6554..bbe4a051 100644
--- a/puppet/services/neutron-compute-plugin-opencontrail.yaml
+++ b/puppet/services/neutron-compute-plugin-opencontrail.yaml
@@ -1,9 +1,18 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Neutron Compute OpenContrail 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
@@ -14,7 +23,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Compute OpenContrail plugin
     value:
-      service_name: neutron-compute-plugin-opencontrail
+      service_name: neutron_compute_plugin_opencontrail
       config_settings:
       step_config: |
         include ::tripleo::profile::base::neutron::opencontrail::vrouter