openstack/kolla-ansible
Code Issues Proposed changes

Reorder operations of mkdir and useradd in toolbox

Browse Source 
The home directory for Ansible already exists and does not
need to be created.  Reorder useradd and mkdir at suggestion
of Jeff Peeler to avoid warning.

The warning looks like this:

INFO:__main__:kolla-toolbox:Step 6 : RUN mkdir -p /etc/ansible /usr/share/ansible /home/ansible     && echo 'localhost ansible_connection=local' > /etc/ansible/hosts     && useradd --user-group ansible --groups kolla     && sed -i 's|  "identity_api_version": "2.0",|  "identity_api_version": "3",|' /usr/lib/python2.7/site-packages/os_client_config/defaults.json
INFO:__main__:kolla-toolbox: ---> Running in ccded9c01fca
INFO:__main__:kolla-toolbox:useradd: warning: the home directory already exists.
INFO:__main__:kolla-toolbox:Not copying any file from skel directory into it.
INFO:__main__:kolla-toolbox:

TrivialFix

Change-Id: I031ade6597f8071f5be1768a7e70b1008dd94e52
This commit is contained in:
Steven Dake 2016-03-09 00:47:15 -05:00
parent f096cdcb40
commit a577634fd3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/kolla-toolbox/Dockerfile.j2
View File

@ -46,9 +46,9 @@ RUN git clone https://github.com/ansible/ansible.git \
&& git submodule update --init --recursive \
&& pip --no-cache-dir install .
RUN mkdir -p /etc/ansible /usr/share/ansible /home/ansible \
RUN useradd --user-group ansible --groups kolla \
&& mkdir -p /etc/ansible /usr/share/ansible \
&& echo 'localhost ansible_connection=local' > /etc/ansible/hosts \
&& useradd --user-group ansible --groups kolla \
&& sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' /usr/lib/python2.7/site-packages/os_client_config/defaults.json
COPY find_disks.py kolla_keystone_service.py kolla_keystone_user.py kolla_sanity.py kolla_zookeeper.py /usr/share/ansible/