X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fcinder-scheduler.yaml;h=eb578e5c7f3f77c80325898c441c734066a6d23f;hb=d6837ea4a62ec74c4b06901c257fe4d6f4bea73c;hp=350d7126fe38247139290fd446237e91c4503484;hpb=73656aac0dbf1e0bbc8ee10cf5f282c93af4174b;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/cinder-scheduler.yaml b/puppet/services/pacemaker/cinder-scheduler.yaml
index 350d7126..eb578e5c 100644
--- a/puppet/services/pacemaker/cinder-scheduler.yaml
+++ b/puppet/services/pacemaker/cinder-scheduler.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Cinder Scheduler 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
@@ -15,6 +24,8 @@ resources:
   CinderSchedulerBase:
     type: ../cinder-scheduler.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
@@ -22,6 +33,7 @@ outputs:
     description: Role data for the Cinder Scheduler role.
     value:
       service_name: cinder_scheduler
+      monitoring_subscription: {get_attr: [CinderSchedulerBase, role_data, monitoring_subscription]}
       config_settings:
         map_merge:
           - get_attr: [CinderSchedulerBase, role_data, config_settings]