X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fcinder-api.yaml;h=7c83037d54ece3fe2ff0c8fc059b9d73047ee0f9;hb=3b62761d2fc25abef4ca98e9d5863197c4497b85;hp=0f66cc06900ba87b4e19ff9650b7ad6bd44564ea;hpb=749d24ec9d6d6c3d0198a287bd7adebca263d7b3;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/cinder-api.yaml b/puppet/services/pacemaker/cinder-api.yaml
index 0f66cc06..7c83037d 100644
--- a/puppet/services/pacemaker/cinder-api.yaml
+++ b/puppet/services/pacemaker/cinder-api.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Cinder API 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,12 +24,15 @@ resources:
   CinderApiBase:
     type: ../cinder-api.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Cinder API role.
     value:
+      service_name: cinder_api
       config_settings:
         map_merge:
           - get_attr: [CinderApiBase, role_data, config_settings]