openstack/kolla-ansible
Code Issues Proposed changes

Merge "drop root on memcached"

Browse Source
This commit is contained in:
Jenkins 2015-11-14 17:11:23 +00:00 committed by Gerrit Code Review
commit fb06344aee
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/memcached/templates/memcached.json.j2
View File

@ -1,5 +1,4 @@
{% set memcache_user = 'memcache' if kolla_base_distro in ['ubuntu', 'debian'] else 'memcached' %}
{ {
"command": "/usr/bin/memcached -u {{ memcache_user }} -vv -l {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} -p {{ memcached_port }}", "command": "/usr/bin/memcached -vv -l {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} -p {{ memcached_port }}",
"config_files": [] "config_files": []
} }

10
docker/memcached/Dockerfile.j2
View File

@ -3,14 +3,20 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set user = 'memcached' %}
RUN yum -y install memcached \ RUN yum -y install memcached \
&& yum clean all && yum clean all \
&& usermod -a -G kolla {{ user }}
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set user = 'memcache' %}
RUN apt-get install -y --no-install-recommends memcached \ RUN apt-get install -y --no-install-recommends memcached \
&& apt-get clean && apt-get clean \
&& usermod -a -G kolla {{ user }}
{% endif %} {% endif %}
{{ include_footer }} {{ include_footer }}
USER {{ user }}