diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-24 16:51:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 16:51:53 -0500 |
| commit | 8ba91f38b5ba6ed0c7c442b359ab6370c494d70e (patch) | |
| tree | 73028e01b058d453164910e312a29551c30ae91d /roles/openshift_logging/tasks/main.yaml | |
| parent | 5a6e44d6f2af320505bd30c25ba98a61ae824da5 (diff) | |
| parent | a674eb52df90f2dba9b8713760dba2a9e3fed7ce (diff) | |
| download | openshift-8ba91f38b5ba6ed0c7c442b359ab6370c494d70e.tar.gz openshift-8ba91f38b5ba6ed0c7c442b359ab6370c494d70e.tar.bz2 openshift-8ba91f38b5ba6ed0c7c442b359ab6370c494d70e.tar.xz openshift-8ba91f38b5ba6ed0c7c442b359ab6370c494d70e.zip | |
Merge pull request #3760 from sdodson/lm-default-images
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_logging/tasks/main.yaml')
| -rw-r--r-- | roles/openshift_logging/tasks/main.yaml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/roles/openshift_logging/tasks/main.yaml b/roles/openshift_logging/tasks/main.yaml index eb60175c7..c7f4a2f93 100644 --- a/roles/openshift_logging/tasks/main.yaml +++ b/roles/openshift_logging/tasks/main.yaml @@ -3,6 +3,17 @@ msg: Only one Fluentd nodeselector key pair should be provided when: "{{ openshift_logging_fluentd_nodeselector.keys() | count }} > 1" +- name: Set default image variables based on deployment_type + include_vars: "{{ item }}" + with_first_found: + - "{{ openshift_deployment_type | default(deployment_type) }}.yml" + - "default_images.yml" + +- name: Set logging image facts + set_fact: + openshift_logging_image_prefix: "{{ openshift_logging_image_prefix | default(__openshift_logging_image_prefix) }}" + openshift_logging_image_version: "{{ openshift_logging_image_version | default(__openshift_logging_image_version) }}" + - name: Create temp directory for doing work in command: mktemp -d /tmp/openshift-logging-ansible-XXXXXX register: mktemp |