Merge "Convert blockstorage-role.yaml to role.role.j2.yaml"

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

diff --git a/puppet/services/database/redis-base.yaml b/puppet/services/database/redis-base.yaml
index 6d77a84..2a6a89e 100644 (file)
--- a/puppet/services/database/redis-base.yaml
+++ b/puppet/services/database/redis-base.yaml
@@ -1,17 +1,21 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack Redis service configured with Puppet
 
 parameters:
   RedisPassword:
-    description: The password for Redis
+    description: The password for the redis service account.
     type: string
     hidden: true
   RedisFDLimit:
     description: Configure Redis FD limit
     type: string
     default: 10240
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -21,6 +25,14 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set