openstack/kolla-ansible
Code Issues Proposed changes

Adjust CMD for data and kolla-ansible

Browse Source 
The CMD command for data causes docker to launch it with /bin/sh which
is ugly when viewing the containers statuses. Additionally for
kolla_ansible we were not specifying the CMD at all, forcing us to use
the 'command' param to set the sleep command.

This patch brings the kolla_ansible launch inline with the rest of the
project.

TrivialFix

Change-Id: Ic87a89921674802c15596756526e07f52a782f32
This commit is contained in:
SamYaple 2015-12-25 21:55:08 +00:00
parent 9e9225d8e6
commit e95c0d3183
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/common/tasks/start.yml
View File

@ -62,4 +62,3 @@
- /var/lib/kolla/dev/log:/dev/log - /var/lib/kolla/dev/log:/dev/log
- /dev/:/dev/ - /dev/:/dev/
- /run/:/run/ - /run/:/run/
command: "/bin/sleep infinity"

2
docker/data/Dockerfile.j2
View File

@ -1,6 +1,6 @@
FROM {{ base_distro }}:{{ base_distro_tag }} FROM {{ base_distro }}:{{ base_distro_tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
CMD /bin/sleep infinity CMD ["/bin/sleep", "infinity"]
{{ include_footer }} {{ include_footer }}

2
docker/kolla-ansible/Dockerfile.j2
View File

@ -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 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 COPY ansible.cfg /home/ansible/.ansible.cfg
CMD ["/bin/sleep", "infinity"]
{{ include_footer }} {{ include_footer }}
USER ansible USER ansible