diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-01-23 16:08:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 16:08:20 -0600 |
| commit | 066494438d5baff9f555cd56a8bde94df148dc31 (patch) | |
| tree | e0c802a5af8dc07f0a16b5d41ebea55de4a34d06 /roles/openshift_logging/tasks | |
| parent | d740fd159416783c88839e6e2c2e150eb81b67da (diff) | |
| parent | c2bdcebcf9bc8aebba6d09a80c6b5cccdb17786d (diff) | |
| download | openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.gz openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.bz2 openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.xz openshift-066494438d5baff9f555cd56a8bde94df148dc31.zip | |
Merge branch 'master' into fix_logging_jks_gen
Diffstat (limited to 'roles/openshift_logging/tasks')
| -rw-r--r-- | roles/openshift_logging/tasks/install_logging.yaml | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml index af03e9371..a9699adb8 100644 --- a/roles/openshift_logging/tasks/install_logging.yaml +++ b/roles/openshift_logging/tasks/install_logging.yaml @@ -23,23 +23,30 @@ loop_control: loop_var: install_component +- find: paths={{ mktemp.stdout }}/templates patterns=*.yaml + register: object_def_files + changed_when: no + +- slurp: src={{item}} + register: object_defs + with_items: "{{object_def_files.files | map(attribute='path') | list | sort}}" + changed_when: no + - name: Create objects include: oc_apply.yaml vars: - kubeconfig: "{{ mktemp.stdout }}/admin.kubeconfig" - namespace: "{{ openshift_logging_namespace }}" - - file_name: "{{ file }}" - - file_content: "{{ lookup('file', file) | from_yaml }}" - with_fileglob: - - "{{ mktemp.stdout }}/templates/*.yaml" + - file_name: "{{ file.source }}" + - file_content: "{{ file.content | b64decode | from_yaml }}" + with_items: "{{ object_defs.results }}" loop_control: loop_var: file when: not ansible_check_mode - name: Printing out objects to create - debug: msg="{{lookup('file', file)|quote}}" - with_fileglob: - - "{{mktemp.stdout}}/templates/*.yaml" + debug: msg={{file.content | b64decode }} + with_items: "{{ object_defs.results }}" loop_control: loop_var: file when: ansible_check_mode |