From e95c0d318361d439c02fe587d691518f6fac36df Mon Sep 17 00:00:00 2001
From: SamYaple <sam@yaple.net>
Date: Fri, 25 Dec 2015 21:55:08 +0000
Subject: [PATCH] Adjust CMD for data and kolla-ansible

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
---
 ansible/roles/common/tasks/start.yml | 1 -
 docker/data/Dockerfile.j2            | 2 +-
 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 68ba56be07..683e7ff5e8 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 c52c568d4b..17cd85b1b6 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 b980eee767..d328f90dd9 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