diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-15 20:08:06 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-15 20:08:06 -0800 |
commit | 9df909053978f515ace83626755a78c163357ba2 (patch) | |
tree | 925a069ddb7bde3ad7422a85f8cb505c4eafd246 /roles/openshift_logging_eventrouter/tasks | |
parent | 6cfc4a162cff36bb2ba7bb482135060e76c5d5a1 (diff) | |
parent | aea3fa16ecf72ea5657fa95d96558a7ebde9f66e (diff) | |
download | openshift-9df909053978f515ace83626755a78c163357ba2.tar.gz openshift-9df909053978f515ace83626755a78c163357ba2.tar.bz2 openshift-9df909053978f515ace83626755a78c163357ba2.tar.xz openshift-9df909053978f515ace83626755a78c163357ba2.zip |
Merge pull request #6037 from ewolinetz/logging_default_images
Automatic merge from submit-queue.
Updating logging components image defaulting pattern
Matches openshift_logging pattern and pattern used by other ansible components
Addresses:
https://bugzilla.redhat.com/show_bug.cgi?id=1505681
Diffstat (limited to 'roles/openshift_logging_eventrouter/tasks')
-rw-r--r-- | roles/openshift_logging_eventrouter/tasks/main.yaml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/roles/openshift_logging_eventrouter/tasks/main.yaml b/roles/openshift_logging_eventrouter/tasks/main.yaml index 58e5a559f..b1f93eeb9 100644 --- a/roles/openshift_logging_eventrouter/tasks/main.yaml +++ b/roles/openshift_logging_eventrouter/tasks/main.yaml @@ -1,4 +1,17 @@ --- +- name: Set default image variables based on deployment_type + include_vars: "{{ var_file_name }}" + with_first_found: + - "{{ openshift_deployment_type | default(deployment_type) }}.yml" + - "default_images.yml" + loop_control: + loop_var: var_file_name + +- name: Set eventrouter image facts + set_fact: + openshift_logging_eventrouter_image_prefix: "{{ openshift_logging_eventrouter_image_prefix | default(__openshift_logging_eventrouter_image_prefix) }}" + openshift_logging_eventrouter_image_version: "{{ openshift_logging_eventrouter_image_version | default(__openshift_logging_eventrouter_image_version) }}" + - include: "{{ role_path }}/tasks/install_eventrouter.yaml" when: openshift_logging_install_eventrouter | default(false) | bool |