Merge "Configure DPDK options to isolate PMD cores and ovs process cores"

[apex-tripleo-heat-templates.git] / puppet / services / neutron-midonet.yaml

diff --git a/puppet/services/neutron-midonet.yaml b/puppet/services/neutron-midonet.yaml
index 736c01c..9198f35 100644 (file)
--- a/puppet/services/neutron-midonet.yaml
+++ b/puppet/services/neutron-midonet.yaml
@@ -1,9 +1,18 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Neutron Midonet plugin and services
 
 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
@@ -31,11 +40,16 @@ parameters:
     description: 'Whether enable Cassandra cluster on Controller'
     type: boolean
     default: false
+  MonitoringSubscriptionNeutronMidonet:
+    default: 'overcloud-neutron-midonet'
+    type: string
 
 outputs:
   role_data:
     description: Role data for the Neutron Midonet plugin and services
     value:
+      service_name: neutron_midonet
+      monitoring_subscription: {get_param: MonitoringSubscriptionNeutronMidonet}
       config_settings:
         tripleo::profile::base::neutron::midonet::admin_password: {get_param: AdminPassword}
         tripleo::profile::base::neutron::midonet::keystone_admin_token: {get_param: AdminToken}