diff options
author | Eric Wolinetz <ewolinet@redhat.com> | 2017-10-25 20:45:34 -0500 |
---|---|---|
committer | Eric Wolinetz <ewolinet@redhat.com> | 2018-01-02 11:16:04 -0600 |
commit | 8cb27ae800df71ee816852df56cd2c861a0f0a0a (patch) | |
tree | 9a3f000d6bb886296912df6de0ececdfe7783a53 /roles/openshift_logging_curator/tasks/main.yaml | |
parent | 332764e4541d8c922f2589a533bb56b2a2419ac1 (diff) | |
download | openshift-8cb27ae800df71ee816852df56cd2c861a0f0a0a.tar.gz openshift-8cb27ae800df71ee816852df56cd2c861a0f0a0a.tar.bz2 openshift-8cb27ae800df71ee816852df56cd2c861a0f0a0a.tar.xz openshift-8cb27ae800df71ee816852df56cd2c861a0f0a0a.zip |
Updating logging_facts to be able to pull values from config maps yaml files, use diffs to keep custom changes, white list certain settings when creating diffs
Diffstat (limited to 'roles/openshift_logging_curator/tasks/main.yaml')
-rw-r--r-- | roles/openshift_logging_curator/tasks/main.yaml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/roles/openshift_logging_curator/tasks/main.yaml b/roles/openshift_logging_curator/tasks/main.yaml index 524e239b7..53b464113 100644 --- a/roles/openshift_logging_curator/tasks/main.yaml +++ b/roles/openshift_logging_curator/tasks/main.yaml @@ -54,14 +54,17 @@ - copy: src: curator.yml dest: "{{ tempdir }}/curator.yml" - when: curator_config_contents is undefined changed_when: no -- copy: - content: "{{ curator_config_contents }}" - dest: "{{ tempdir }}/curator.yml" - when: curator_config_contents is defined - changed_when: no +- include_role: + name: openshift_logging + tasks_from: patch_configmap_files.yaml + vars: + configmap_name: "logging-curator" + configmap_namespace: "logging" + configmap_file_names: + - current_file: "config.yaml" + new_file: "{{ tempdir }}/curator.yml" - name: Set Curator configmap oc_configmap: |