Merge "HPELeftHandISCSIDriver support for Cinder"

[apex-tripleo-heat-templates.git] / puppet / services / pacemaker / database / redis.yaml

diff --git a/puppet/services/pacemaker/database/redis.yaml b/puppet/services/pacemaker/database/redis.yaml
index dd677a9..e702d28 100644 (file)
--- a/puppet/services/pacemaker/database/redis.yaml
+++ b/puppet/services/pacemaker/database/redis.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Redis service configured with Puppet
@@ -10,6 +10,9 @@ parameters:
                  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
@@ -18,9 +21,10 @@ parameters:
 
 resources:
   RedisBase:
-    type: ../../database/redis-base.yaml
+    type: ../../database/redis.yaml
     properties:
       ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs: