diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-02 09:31:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-02 09:31:48 +0000 |
| commit | 46f5e4cee14815a10dcfeb3809ae9c58c5cd2d11 (patch) | |
| tree | 9c34758b99533281deda10ee8802feb610df4ba8 | |
| parent | 8c2bbae69e336c34bc4e2a97dbabb517a33395d0 (diff) | |
| parent | 7f8b40538f41757cd063e6bb6e2a4b2104d08426 (diff) | |
| download | kolla-46f5e4cee14815a10dcfeb3809ae9c58c5cd2d11.tar.gz kolla-46f5e4cee14815a10dcfeb3809ae9c58c5cd2d11.zip | |
Merge "Use the standard start method for kolla-toolbox container"
| -rw-r--r-- | ansible/roles/common/tasks/config.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/common/tasks/start.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/common/templates/kolla-toolbox.json.j2 | 4 | ||||
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index 3739a4955..83c87652b 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/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 diff --git a/ansible/roles/common/tasks/start.yml b/ansible/roles/common/tasks/start.yml index 11c0c9ff9..0ef379c4e 100644 --- a/ansible/roles/common/tasks/start.yml +++ b/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/" diff --git a/ansible/roles/common/templates/kolla-toolbox.json.j2 b/ansible/roles/common/templates/kolla-toolbox.json.j2 new file mode 100644 index 000000000..220022a9d --- /dev/null +++ b/ansible/roles/common/templates/kolla-toolbox.json.j2 @@ -0,0 +1,4 @@ +{ + "command": "sleep infinity", + "config_files": [] +} diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 9a6ce95cd..25b8bcce8 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/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 }} |