diff options
| author | Steven Dake <stdake@cisco.com> | 2016-03-09 00:47:15 -0500 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2016-03-17 13:30:28 -0700 |
| commit | a577634fd37eb813315f0dec4bcf6570eeaca0a2 (patch) | |
| tree | 8e18170e24fd94a5b4b5f94509549bf8386ea0a8 | |
| parent | f096cdcb40e683101b60282c7304e40f1670242a (diff) | |
| download | kolla-a577634fd37eb813315f0dec4bcf6570eeaca0a2.tar.gz kolla-a577634fd37eb813315f0dec4bcf6570eeaca0a2.zip | |
Reorder operations of mkdir and useradd in toolbox
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
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 466018e9d..22705de7a 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -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/ |