aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorJeffrey Zhang <zhang.lei.fly@gmail.com>2016-09-01 22:14:48 +0800
committerJeffrey Zhang <zhang.lei.fly@gmail.com>2016-09-02 00:06:47 +0800
commit7f8b40538f41757cd063e6bb6e2a4b2104d08426 (patch)
treee01e6088bf400fd17405ab75422d5d7637c14a74 /ansible
parentac0ba62bdf5eb00d887ceacc20ff18215c5d34ea (diff)
downloadkolla-7f8b40538f41757cd063e6bb6e2a4b2104d08426.tar.gz
kolla-7f8b40538f41757cd063e6bb6e2a4b2104d08426.zip
Use the standard start method for kolla-toolbox container
TrivialFix Change-Id: Icb092e47713e0b89859747d6ed4c02b3950d7ced Signed-off-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/common/tasks/config.yml2
-rw-r--r--ansible/roles/common/tasks/start.yml1
-rw-r--r--ansible/roles/common/templates/kolla-toolbox.json.j24
3 files changed, 7 insertions, 0 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": []
+}