X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=puppet%2Fservices%2Faodh-notifier.yaml;h=da85581bdebd90b84c3a4de9ceb44b73b9bce470;hb=3243a1ab275648a17c98f47735a4490b59478d1e;hp=de07f78067e358681287ce855ef46931d0c1f6a5;hpb=ff43f1d38ac2821b24ed81fc4b3537be7035f8a5;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/aodh-notifier.yaml b/puppet/services/aodh-notifier.yaml
index de07f780..da85581b 100644
--- a/puppet/services/aodh-notifier.yaml
+++ b/puppet/services/aodh-notifier.yaml
@@ -1,19 +1,33 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Aodh Notifier service 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
+  MonitoringSubscriptionAodhNotifier:
+    default: 'overcloud-ceilometer-aodh-notifier'
+    type: string
 
 resources:
   AodhBase:
     type: ./aodh-base.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
@@ -21,6 +35,7 @@ outputs:
     description: Role data for the Aodh Notifier service.
     value:
       service_name: aodh_notifier
+      monitoring_subscription: {get_param: MonitoringSubscriptionAodhNotifier}
       config_settings:
         get_attr: [AodhBase, role_data, config_settings]
       step_config: |