Swift proxy align *-quotas with puppet-swift syntax

[apex-tripleo-heat-templates.git] / puppet / services / neutron-compute-plugin-opencontrail.yaml

diff --git a/puppet/services/neutron-compute-plugin-opencontrail.yaml b/puppet/services/neutron-compute-plugin-opencontrail.yaml
index b95a655..bbe4a05 100644 (file)
--- 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