diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-29 01:13:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-29 01:13:59 +0000 |
| commit | 7aec0653f67da59f7437505624752b4583d52410 (patch) | |
| tree | 843dd42b1686da187c324a11ae4a338a22ca41e7 | |
| parent | c5c5c6e444287323a13c0558ac673ce21d9e3bb2 (diff) | |
| parent | e95c0d318361d439c02fe587d691518f6fac36df (diff) | |
| download | kolla-7aec0653f67da59f7437505624752b4583d52410.tar.gz kolla-7aec0653f67da59f7437505624752b4583d52410.zip | |
Merge "Adjust CMD for data and kolla-ansible"
| -rwxr-xr-x | ansible/roles/common/tasks/start.yml | 1 | ||||
| -rw-r--r-- | docker/data/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/kolla-ansible/Dockerfile.j2 | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/ansible/roles/common/tasks/start.yml b/ansible/roles/common/tasks/start.yml index 68ba56be0..683e7ff5e 100755 --- a/ansible/roles/common/tasks/start.yml +++ b/ansible/roles/common/tasks/start.yml @@ -62,4 +62,3 @@ - /var/lib/kolla/dev/log:/dev/log - /dev/:/dev/ - /run/:/run/ - command: "/bin/sleep infinity" diff --git a/docker/data/Dockerfile.j2 b/docker/data/Dockerfile.j2 index c52c568d4..17cd85b1b 100644 --- a/docker/data/Dockerfile.j2 +++ b/docker/data/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ base_distro }}:{{ base_distro_tag }} MAINTAINER {{ maintainer }} -CMD /bin/sleep infinity +CMD ["/bin/sleep", "infinity"] {{ include_footer }} diff --git a/docker/kolla-ansible/Dockerfile.j2 b/docker/kolla-ansible/Dockerfile.j2 index b980eee76..d328f90dd 100644 --- a/docker/kolla-ansible/Dockerfile.j2 +++ b/docker/kolla-ansible/Dockerfile.j2 @@ -55,6 +55,8 @@ RUN mkdir -p /etc/ansible /usr/share/ansible /home/ansible \ COPY find_disks.py kolla_keystone_service.py kolla_keystone_user.py kolla_sanity.py kolla_zookeeper.py /usr/share/ansible/ COPY ansible.cfg /home/ansible/.ansible.cfg +CMD ["/bin/sleep", "infinity"] + {{ include_footer }} USER ansible |