Merge "Use the standard start method for kolla-toolbox container"

ansible/roles/common/tasks/config.yml

@@ -6,6 +6,7 @@
     recurse: yes
   with_items:
     - "heka"
+    - "kolla-toolbox"
     - "cron"
     - "cron/logrotate"
 
@@ -15,6 +16,7 @@
     dest: "{{ node_config_directory }}/{{ item }}/config.json"
   with_items:
     - "heka"
+    - "kolla-toolbox"
     - "cron"
 
 - name: Copying over heka config files

ansible/roles/common/tasks/start.yml

@@ -26,6 +26,7 @@
     name: "kolla_toolbox"
     privileged: True
     volumes:
+      - "{{ node_config_directory }}/kolla-toolbox/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
       - "/dev/:/dev/"
       - "/run/:/run/"

ansible/roles/common/templates/kolla-toolbox.json.j2

@@ -0,0 +1,4 @@
+{
+    "command": "sleep infinity",
+    "config_files": []
+}

docker/kolla-toolbox/Dockerfile.j2

@@ -68,8 +68,6 @@ COPY ansible.cfg /home/ansible/.ansible.cfg
 COPY ansible_sudoers /etc/sudoers.d/ansible_sudoers
 RUN chmod 440 /etc/sudoers.d/ansible_sudoers
 
-CMD ["/usr/local/bin/dumb-init", "/bin/sleep", "infinity"]
-
 {% block kolla_toolbox_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 {{ include_footer }}