Merge "Modify external loadbalancer environments to use new FixedIPs"

[apex-tripleo-heat-templates.git] / puppet / services / pacemaker / ceilometer-agent-notification.yaml

diff --git a/puppet/services/pacemaker/ceilometer-agent-notification.yaml b/puppet/services/pacemaker/ceilometer-agent-notification.yaml
index 0fb008c..dbe1449 100644 (file)
--- a/puppet/services/pacemaker/ceilometer-agent-notification.yaml
+++ b/puppet/services/pacemaker/ceilometer-agent-notification.yaml
@@ -4,23 +4,38 @@ description: >
   OpenStack Ceilometer Notification Agent 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
+  MonitoringSubscriptionCeilometerNotification:
+    default: 'overcloud-ceilometer-agent-notification'
+    type: string
 
 resources:
   CeilometerServiceBase:
-    type: ../ceilometer-base.yaml
+    type: ../ceilometer-agent-notification.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Ceilometer Notification Agent pacemaker role.
     value:
-      service_name: ceilometer-agent-notification
+      service_name: ceilometer_agent_notification
+      monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerNotification}
       config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]