From 3118558cf1151786b488aae6c035b79b1e911285 Mon Sep 17 00:00:00 2001
From: Flavio Percoco <flaper87@gmail.com>
Date: Wed, 8 Feb 2017 15:40:24 +0100
Subject: Add redis container

The patch adds a redis container for kolla. It's highly influenced by
memcached's container.

Implemenets: blueprint redis-container
Change-Id: Ib2ac6d6b9f01b8514728790dd474236fd60a62fd
---
 docker/redis/Dockerfile.j2                           | 20 ++++++++++++++++++++
 kolla/common/config.py                               |  6 ++++++
 .../notes/redis-container-810eec9915d426d8.yaml      |  3 +++
 3 files changed, 29 insertions(+)
 create mode 100644 docker/redis/Dockerfile.j2
 create mode 100644 releasenotes/notes/redis-container-810eec9915d426d8.yaml

diff --git a/docker/redis/Dockerfile.j2 b/docker/redis/Dockerfile.j2
new file mode 100644
index 000000000..e07c4998c
--- /dev/null
+++ b/docker/redis/Dockerfile.j2
@@ -0,0 +1,20 @@
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% block redis_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='redis', homedir='/run/redis') }}
+
+{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% set redis_packages = ['redis'] %}
+{% elif base_distro in ['ubuntu', 'debian'] %}
+    {% set redis_packages = ['redis-server'] %}
+{% endif %}
+{{ macros.install_packages(redis_packages | customizable("packages")) }}
+
+{% block redis_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER redis
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 01bfb6d53..8ba21928d 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -51,6 +51,7 @@ _PROFILE_OPTS = [
                     'mongodb',
                     'openvswitch',
                     'rabbitmq',
+                    'redis',
                     'tgtd',
                 ],
                 help='Infra images'),
@@ -89,6 +90,7 @@ _PROFILE_OPTS = [
                     'octavia',
                     'panko',
                     'rally',
+                    'redis',
                     'sahara',
                     'searchlight',
                     'senlin',
@@ -757,6 +759,10 @@ USERS = {
         'uid': 42459,
         'gid': 42459,
     },
+    'redis-user': {
+        'uid': 42460,
+        'gid': 42460,
+    },
 }
 
 
diff --git a/releasenotes/notes/redis-container-810eec9915d426d8.yaml b/releasenotes/notes/redis-container-810eec9915d426d8.yaml
new file mode 100644
index 000000000..4cbe11d45
--- /dev/null
+++ b/releasenotes/notes/redis-container-810eec9915d426d8.yaml
@@ -0,0 +1,3 @@
+---
+features:
+    - Add a redis image used by ceilometer and zaqar
-- 
cgit v1.2.3