X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fdatabase%2Fredis.yaml;h=fbf53cb9fb5d6c48414b9a86de521677ad1db302;hb=a096ddab348d296994838e02169662ca916e09da;hp=ca7b86ab8b12b7c0beb1fc7dd842a1f4403b998f;hpb=48e1b90594f6cb0d91fc6eb2c989de1a043c0ee5;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml
index ca7b86ab..fbf53cb9 100644
--- a/docker/services/database/redis.yaml
+++ b/docker/services/database/redis.yaml
@@ -26,6 +26,13 @@ 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
 
 resources:
 
@@ -41,14 +48,20 @@ outputs:
     description: Role data for the Redis API role.
     value:
       service_name: {get_attr: [RedisBase, role_data, service_name]}
-      config_settings: {get_attr: [RedisBase, role_data, config_settings]}
+      config_settings:
+        map_merge:
+          - {get_attr: [RedisBase, role_data, config_settings]}
+          - redis::daemonize: false
       step_config: &step_config
         get_attr: [RedisBase, role_data, step_config]
       service_config_settings: {get_attr: [RedisBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: 'redis'
-        puppet_tags: 'file'
+        # NOTE: we need the exec tag to copy /etc/redis.conf.puppet to
+        # /etc/redis.conf
+        # https://github.com/arioch/puppet-redis/commit/1c004143223e660cbd433422ff8194508aab9763
+        puppet_tags: 'exec'
         step_config: *step_config
         config_image: &redis_image
           list_join:
@@ -57,6 +70,10 @@ outputs:
       kolla_config:
         /var/lib/kolla/config_files/redis.json:
           command: /usr/bin/redis-server /etc/redis.conf
+          permissions:
+            - path: /var/run/redis
+              owner: redis:redis
+              recurse: true
       docker_config:
         step_1:
           redis:
@@ -72,6 +89,11 @@ outputs:
               - logs:/var/log/kolla
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      host_prep_tasks:
+        - name: create /var/run/redis
+          file:
+            path: /var/run/redis
+            state: directory
       upgrade_tasks:
         - name: Stop and disable redis service
           tags: step2