X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fdatabase%2Fredis-base.yaml;h=2fab0eb6b0a465d74e6f97a19935897b28ddc05c;hb=ec678ff25332a2441cd3e2330b1a07b5316ead10;hp=24175d56253debbad52d00ecf2e931f27c584613;hpb=1eeb7a806999a85a20dfc86dd465135a885da397;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/database/redis-base.yaml b/puppet/services/database/redis-base.yaml
index 24175d56..2fab0eb6 100644
--- a/puppet/services/database/redis-base.yaml
+++ b/puppet/services/database/redis-base.yaml
@@ -8,18 +8,37 @@ 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
+  DefaultPasswords:
+    default: {}
+    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}
         redis::sentinel_auth_pass: {get_param: RedisPassword}
+        # NOTE: bind IP is found in Heat replacing the network name with the local node IP
+        # for the given network; replacement examples (eg. for internal_api):
+        # internal_api -> IP
+        # internal_api_uri -> [IP]
+        # internal_api_subnet - > IP/CIDR
+        redis::bind: {get_param: [ServiceNetMap, RedisNetwork]}
         redis::port: 6379
-        redis::sentinel::master_name: '"%{hiera(\"bootstrap_nodeid\")}"'
-        redis::sentinel::redis_host: '"%{hiera(\"bootstrap_nodeid_ip\")}"'
+        redis::sentinel::master_name: "%{hiera('bootstrap_nodeid')}"
+        redis::sentinel::redis_host: "%{hiera('bootstrap_nodeid_ip')}"
         redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
-        tripleo::loadbalancer::redis_password: {get_param: RedisPassword}