diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-18 01:58:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-18 01:58:06 +0000 |
| commit | 7adfd95184bdbb41fddcf588d00fa74604406d26 (patch) | |
| tree | 0172caa0d6e8d28fbe767e31b60908f306ada5d5 | |
| parent | 0b19bbc132b96a81aaf2379883a3190c27c9f3be (diff) | |
| parent | a577634fd37eb813315f0dec4bcf6570eeaca0a2 (diff) | |
| download | kolla-7adfd95184bdbb41fddcf588d00fa74604406d26.tar.gz kolla-7adfd95184bdbb41fddcf588d00fa74604406d26.zip | |
Merge "Reorder operations of mkdir and useradd in toolbox"
| -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/ |