Merge "Fix common role when using external mariadb"

This commit is contained in:
Zuul 2020-10-07 20:54:07 +00:00 committed by Gerrit Code Review
commit 950b038a7a

View File

@ -72,7 +72,7 @@
run_once: True run_once: True
register: find_custom_fluentd_inputs register: find_custom_fluentd_inputs
delegate_to: localhost delegate_to: localhost
when: common_services.fluentd | service_enabled_and_mapped_to_host when: common_services.fluentd.enabled | bool
- name: Find custom fluentd filter config files - name: Find custom fluentd filter config files
find: find:
@ -81,7 +81,7 @@
run_once: True run_once: True
register: find_custom_fluentd_filters register: find_custom_fluentd_filters
delegate_to: localhost delegate_to: localhost
when: common_services.fluentd | service_enabled_and_mapped_to_host when: common_services.fluentd.enabled | bool
- name: Find custom fluentd format config files - name: Find custom fluentd format config files
find: find:
@ -90,8 +90,7 @@
run_once: True run_once: True
register: find_custom_fluentd_formats register: find_custom_fluentd_formats
delegate_to: localhost delegate_to: localhost
when: when: common_services.fluentd.enabled | bool
- common_services.fluentd | service_enabled_and_mapped_to_host
- name: Find custom fluentd output config files - name: Find custom fluentd output config files
find: find:
@ -100,8 +99,7 @@
run_once: True run_once: True
register: find_custom_fluentd_outputs register: find_custom_fluentd_outputs
delegate_to: localhost delegate_to: localhost
when: when: common_services.fluentd.enabled | bool
- common_services.fluentd | service_enabled_and_mapped_to_host
- name: Copying over td-agent.conf - name: Copying over td-agent.conf
vars: vars: