openstack/kolla-ansible
Code Issues Proposed changes

Make fluentd enabled configurable

Browse Source 
Although there is an option "enable_fluentd", but there are still
some tasks that make fluentd not configurable.

Change-Id: Ic0a9deb36fce154022925d26411e01a8ffe18b50
Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>
This commit is contained in:
Xinliang Liu 2017-12-15 10:18:38 +08:00
parent c609633a06
commit 1d36adcb4f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/common/tasks/config.yml
View File

@ -80,12 +80,16 @@
pattern: "*.conf" pattern: "*.conf"
run_once: True run_once: True
register: find_custom_fluentd_outputs register: find_custom_fluentd_outputs
when:
- enable_fluentd | bool
- name: Copying over custom fluentd output config files - name: Copying over custom fluentd output config files
template: template:
src: "{{ item.path }}" src: "{{ item.path }}"
dest: "{{ node_config_directory }}/fluentd/output/{{ item.path | basename }}" dest: "{{ node_config_directory }}/fluentd/output/{{ item.path | basename }}"
register: fluentd_output_custom register: fluentd_output_custom
when:
- enable_fluentd | bool
with_items: "{{ find_custom_fluentd_outputs.files }}" with_items: "{{ find_custom_fluentd_outputs.files }}"
notify: notify:
- Restart fluentd container - Restart fluentd container

2
ansible/roles/common/tasks/pull.yml
View File

@ -4,4 +4,6 @@
action: "pull_image" action: "pull_image"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
image: "{{ item.value.image }}" image: "{{ item.value.image }}"
when:
- item.value.enabled | bool
with_dict: "{{ common_services }}" with_dict: "{{ common_services }}"