Use the standard start method for kolla-toolbox container

TrivialFix

Change-Id: Icb092e47713e0b89859747d6ed4c02b3950d7ced
Signed-off-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
This commit is contained in:
Jeffrey Zhang 2016-09-01 22:14:48 +08:00
parent ac0ba62bdf
commit 7f8b40538f
No known key found for this signature in database
GPG Key ID: B178EDF8751547E8
4 changed files with 7 additions and 2 deletions

View File

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

View File

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

View File

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

View File

@ -68,8 +68,6 @@ COPY ansible.cfg /home/ansible/.ansible.cfg
COPY ansible_sudoers /etc/sudoers.d/ansible_sudoers COPY ansible_sudoers /etc/sudoers.d/ansible_sudoers
RUN chmod 440 /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 kolla_toolbox_footer %}{% endblock %}
{% block footer %}{% endblock %} {% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}