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 0e46f8a..e702d28 100644 (file)
--- a/puppet/services/pacemaker/database/redis.yaml
+++ b/puppet/services/pacemaker/database/redis.yaml
@@ -1,9 +1,18 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Redis 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
@@ -12,17 +21,21 @@ 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:
   role_data:
     description: Role data for the Redis pacemaker role.
     value:
+      service_name: redis
       config_settings:
         map_merge:
           - get_attr: [RedisBase, role_data, config_settings]
-          - tripleo::profile::pacemaker::database::redis::redis_vip: {get_input: redis_vip}
-            redis::service_manage: false
+          - redis::service_manage: false
             redis::notify_service: false
       step_config: |
         include ::tripleo::profile::pacemaker::database::redis