diff options
| author | Flavio Percoco <flaper87@gmail.com> | 2017-02-08 15:40:24 +0100 |
|---|---|---|
| committer | Flavio Percoco <flaper87@gmail.com> | 2017-02-08 17:30:14 +0100 |
| commit | 3118558cf1151786b488aae6c035b79b1e911285 (patch) | |
| tree | b1b5115b72766a878eb01fd05c8ba10682779e9a | |
| parent | 8c55e1ca59f28ec63a56561d0edde435274c4381 (diff) | |
| download | kolla-3118558cf1151786b488aae6c035b79b1e911285.tar.gz kolla-3118558cf1151786b488aae6c035b79b1e911285.zip | |
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
| -rw-r--r-- | docker/redis/Dockerfile.j2 | 20 | ||||
| -rwxr-xr-x | kolla/common/config.py | 6 | ||||
| -rw-r--r-- | releasenotes/notes/redis-container-810eec9915d426d8.yaml | 3 |
3 files changed, 29 insertions, 0 deletions
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 |