summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_curator/tasks/main.yaml
diff options
context:
space:
mode:
authorEric Wolinetz <ewolinet@redhat.com>2017-11-06 15:53:55 -0600
committerEric Wolinetz <ewolinet@redhat.com>2017-11-06 15:56:54 -0600
commit6575595891f71e7d9b9ac929b9ba58117a65e17b (patch)
treeab67b815c16d300296d6c751a25daeb1a824d8c6 /roles/openshift_logging_curator/tasks/main.yaml
parent9e5462826beb7bece09e55b20f3fe47a65c8b44c (diff)
downloadopenshift-6575595891f71e7d9b9ac929b9ba58117a65e17b.tar.gz
openshift-6575595891f71e7d9b9ac929b9ba58117a65e17b.tar.bz2
openshift-6575595891f71e7d9b9ac929b9ba58117a65e17b.tar.xz
openshift-6575595891f71e7d9b9ac929b9ba58117a65e17b.zip
Updating logging components image defaulting pattern to match openshift_logging pattern
Diffstat (limited to 'roles/openshift_logging_curator/tasks/main.yaml')
-rw-r--r--roles/openshift_logging_curator/tasks/main.yaml13
1 files changed, 13 insertions, 0 deletions
diff --git a/roles/openshift_logging_curator/tasks/main.yaml b/roles/openshift_logging_curator/tasks/main.yaml
index fcaf18ed4..87dc1192b 100644
--- a/roles/openshift_logging_curator/tasks/main.yaml
+++ b/roles/openshift_logging_curator/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 curator image facts
+ set_fact:
+ openshift_logging_curator_image_prefix: "{{ openshift_logging_curator_image_prefix | default(__openshift_logging_curator_image_prefix) }}"
+ openshift_logging_curator_image_version: "{{ openshift_logging_curator_image_version | default(__openshift_logging_curator_image_version) }}"
+
- include: determine_version.yaml
# allow passing in a tempdir