summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2017-01-20 16:42:55 -0500
committerGitHub <noreply@github.com>2017-01-20 16:42:55 -0500
commit5f92d54e6ea903e9c17c005f5f04caf7443ab06f (patch)
tree8328d5645a99a21086ab7242c9dd53fe1df03957
parent00b178ec89934ee1fec3f64ec4bc6d53cb05a9e4 (diff)
parentebd4158724ffa3db880fa5604d1389c58f0f9399 (diff)
downloadopenshift-5f92d54e6ea903e9c17c005f5f04caf7443ab06f.tar.gz
openshift-5f92d54e6ea903e9c17c005f5f04caf7443ab06f.tar.bz2
openshift-5f92d54e6ea903e9c17c005f5f04caf7443ab06f.tar.xz
openshift-5f92d54e6ea903e9c17c005f5f04caf7443ab06f.zip
Merge pull request #3136 from jcantrill/logging_oc_apply
fix openshift_logging oc_apply to allow running on any control node
-rw-r--r--roles/openshift_logging/tasks/install_logging.yaml21
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