X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fneutron-metadata.yaml;h=2c3dd374253e958a898e3a72866f033bfa69493d;hb=9087536ceadc9851b0839060a8c483330ddb0546;hp=79baf1eae82301161f162b63b0421ec5080d97dd;hpb=05720272733a8fa62713411673b233b416f3f3a1;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/neutron-metadata.yaml b/puppet/services/pacemaker/neutron-metadata.yaml
index 79baf1ea..2c3dd374 100644
--- a/puppet/services/pacemaker/neutron-metadata.yaml
+++ b/puppet/services/pacemaker/neutron-metadata.yaml
@@ -1,30 +1,41 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Neutron Metadata service with Pacemaker configured with Puppet.
 
 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
                  via parameter_defaults in the resource registry.
     type: json
-  MysqlVirtualIPUri:
-    type: string
-    default: ''
 
 resources:
 
   NeutronMetadataBase:
     type: ../neutron-metadata.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
-      MysqlVirtualIPUri: {get_param: MysqlVirtualIPUri}
 
 outputs:
   role_data:
     description: Role data for the Neutron Metadata role.
     value:
+      service_name: neutron_metadata
+      monitoring_subscription: {get_attr: [NeutronMetadataBase, role_data, monitoring_subscription]}
+      logging_source: {get_attr: [NeutronMetadataBase, role_data, logging_source]}
+      logging_groups: {get_attr: [NeutronMetadataBase, role_data, logging_groups]}
       config_settings:
         map_merge:
           - get_attr: [NeutronMetadataBase, role_data, config_settings]