diff options
Diffstat (limited to 'roles/openshift_logging_mux')
| -rw-r--r-- | roles/openshift_logging_mux/tasks/main.yaml | 24 | 
1 files changed, 11 insertions, 13 deletions
| diff --git a/roles/openshift_logging_mux/tasks/main.yaml b/roles/openshift_logging_mux/tasks/main.yaml index 59a6301d7..a281c6a53 100644 --- a/roles/openshift_logging_mux/tasks/main.yaml +++ b/roles/openshift_logging_mux/tasks/main.yaml @@ -88,26 +88,24 @@  - copy:      src: fluent.conf      dest: "{{mktemp.stdout}}/fluent-mux.conf" -  when: fluentd_mux_config_contents is undefined    changed_when: no  - copy:      src: secure-forward.conf      dest: "{{mktemp.stdout}}/secure-forward-mux.conf" -  when: fluentd_mux_securefoward_contents is undefined    changed_when: no -- copy: -    content: "{{fluentd_mux_config_contents}}" -    dest: "{{mktemp.stdout}}/fluent-mux.conf" -  when: fluentd_mux_config_contents is defined -  changed_when: no - -- copy: -    content: "{{fluentd_mux_secureforward_contents}}" -    dest: "{{mktemp.stdout}}/secure-forward-mux.conf" -  when: fluentd_mux_secureforward_contents is defined -  changed_when: no +- include_role: +    name: openshift_logging +    tasks_from: patch_configmap_files.yaml +  vars: +    configmap_name: "logging-mux" +    configmap_namespace: "{{ openshift_logging_mux_namespace }}" +    configmap_file_names: +      - current_file: "fluent.conf" +        new_file: "{{ tempdir }}/fluent-mux.conf" +      - current_file: "secure-forward.conf" +        new_file: "{{ tempdir }}/secure-forward-mux.conf"  - name: Set Mux configmap    oc_configmap: | 
