From 58eee09c15dea81ec51bb366af23681de70ceaa1 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Sun, 18 Dec 2016 19:11:47 +0000 Subject: use static uid/gid in images This centralizes all user and group creation into a single source. This will fix any current and furture uid/gid mismatches (such as with nova-libvirt). In the process, we also unify users between the distros in a standard way. The users in the following containers change from thier defaults: Ubuntu: _chrony user is now chrony Ubuntu: memcache user is now memcached All: qemu user is used for ownership and socket permissions All uid and gid numbers are customizable via kolla-build.conf Co-Authored-By: Kris Lindgren Change-Id: I120f26ab0683dc87d69727c3df8d4707e52a4543 Partially-Implements: blueprint static-uid-gid --- docker/kolla-toolbox/Dockerfile.j2 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'docker/kolla-toolbox') diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index c2f1c47a6..5c5fa738f 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -7,6 +7,8 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='ansible') }} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set kolla_toolbox_packages = [ 'crudini', @@ -62,13 +64,12 @@ RUN pip --no-cache-dir install \ pyudev \ shade==1.5.0 -RUN useradd -m --user-group ansible --groups kolla \ - && mkdir -p /etc/ansible /usr/share/ansible \ +RUN mkdir -p /etc/ansible /usr/share/ansible \ && echo 'localhost ansible_connection=local' > /etc/ansible/hosts \ && sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' {{ os_client_config }} COPY find_disks.py kolla_keystone_service.py kolla_keystone_user.py kolla_sanity.py /usr/share/ansible/ -COPY ansible.cfg /home/ansible/.ansible.cfg +COPY ansible.cfg /var/lib/ansible/.ansible.cfg COPY ansible_sudoers /etc/sudoers.d/kolla_ansible_sudoers RUN chmod 440 /etc/sudoers.d/kolla_ansible_sudoers -- cgit v1.2.3