Merge "Pass ServiceNetMap to services"

[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 24175d5..5959d2c 100644 (file)
--- a/puppet/services/database/redis-base.yaml
+++ b/puppet/services/database/redis-base.yaml
@@ -8,12 +8,23 @@ parameters:
     description: The password for Redis
     type: string
     hidden: true
+  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
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
 
 outputs:
   role_data:
     description: Role data for the redis role.
     value:
-      service_name: redis-base
+      service_name: redis_base
       config_settings:
         redis::requirepass: {get_param: RedisPassword}
         redis::masterauth: {get_param: RedisPassword}