openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix local_action and line_length>160 in common role"

Browse Source
This commit is contained in:
Zuul 2019-11-19 11:14:33 +00:00 committed by Gerrit Code Review
commit e5149cbcc2
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@
- name: Set fluentd facts - name: Set fluentd facts
set_fact: set_fact:
fluentd_binary: "{% if fluentd_labels.images.0.ContainerConfig.Labels.fluentd_binary is not defined %}{% if kolla_base_distro in 'ubuntu' and ansible_architecture == 'x86_64' %}td-agent{% else %}fluentd{% endif %}{% else %}{{ fluentd_labels.images.0.ContainerConfig.Labels.fluentd_binary }}{% endif %}" fluentd_binary: "{{ fluentd_labels.images.0.ContainerConfig.Labels.fluentd_binary }}"
when: enable_fluentd | bool when: enable_fluentd | bool
- name: Copying over config.json files for services - name: Copying over config.json files for services
@ -64,12 +64,12 @@
- "Restart {{ item.key }} container" - "Restart {{ item.key }} container"
- name: Find custom fluentd input config files - name: Find custom fluentd input config files
local_action: find:
module: find
path: "{{ node_custom_config }}/fluentd/input" path: "{{ node_custom_config }}/fluentd/input"
pattern: "*.conf" pattern: "*.conf"
run_once: True run_once: True
register: find_custom_fluentd_inputs register: find_custom_fluentd_inputs
delegate_to: localhost
when: when:
- enable_fluentd | bool - enable_fluentd | bool
@ -115,12 +115,12 @@
not enable_monasca | bool }}" not enable_monasca | bool }}"
- name: Find custom fluentd output config files - name: Find custom fluentd output config files
local_action: find:
module: find
path: "{{ node_custom_config }}/fluentd/output" path: "{{ node_custom_config }}/fluentd/output"
pattern: "*.conf" pattern: "*.conf"
run_once: True run_once: True
register: find_custom_fluentd_outputs register: find_custom_fluentd_outputs
delegate_to: localhost
when: when:
- enable_fluentd | bool - enable_fluentd | bool
@ -175,12 +175,12 @@
- Restart fluentd container - Restart fluentd container
- name: Find custom fluentd format config files - name: Find custom fluentd format config files
local_action: find:
module: find
path: "{{ node_custom_config }}/fluentd/format" path: "{{ node_custom_config }}/fluentd/format"
pattern: "*.conf" pattern: "*.conf"
run_once: True run_once: True
register: find_custom_fluentd_format register: find_custom_fluentd_format
delegate_to: localhost
when: when:
- enable_fluentd | bool - enable_fluentd | bool
@ -213,12 +213,12 @@
- Restart fluentd container - Restart fluentd container
- name: Find custom fluentd filter config files - name: Find custom fluentd filter config files
local_action: find:
module: find
path: "{{ node_custom_config }}/fluentd/filter" path: "{{ node_custom_config }}/fluentd/filter"
pattern: "*.conf" pattern: "*.conf"
run_once: True run_once: True
register: find_custom_fluentd_filters register: find_custom_fluentd_filters
delegate_to: localhost
when: enable_fluentd | bool when: enable_fluentd | bool
- name: Copying over fluentd filter config files - name: Copying over fluentd filter config files