diff options
author | Eric Wolinetz <ewolinet@redhat.com> | 2017-11-06 15:53:55 -0600 |
---|---|---|
committer | Eric Wolinetz <ewolinet@redhat.com> | 2017-11-06 15:56:54 -0600 |
commit | 6575595891f71e7d9b9ac929b9ba58117a65e17b (patch) | |
tree | ab67b815c16d300296d6c751a25daeb1a824d8c6 /roles/openshift_logging_elasticsearch/tasks/main.yaml | |
parent | 9e5462826beb7bece09e55b20f3fe47a65c8b44c (diff) | |
download | openshift-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_elasticsearch/tasks/main.yaml')
-rw-r--r-- | roles/openshift_logging_elasticsearch/tasks/main.yaml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/roles/openshift_logging_elasticsearch/tasks/main.yaml b/roles/openshift_logging_elasticsearch/tasks/main.yaml index e7ef443bd..2bd02af60 100644 --- a/roles/openshift_logging_elasticsearch/tasks/main.yaml +++ b/roles/openshift_logging_elasticsearch/tasks/main.yaml @@ -15,18 +15,22 @@ elasticsearch_name: "{{ 'logging-elasticsearch' ~ ( (openshift_logging_elasticsearch_ops_deployment | default(false) | bool) | ternary('-ops', '')) }}" es_component: "{{ 'es' ~ ( (openshift_logging_elasticsearch_ops_deployment | default(false) | bool) | ternary('-ops', '') ) }}" -- include: determine_version.yaml - - name: Set default image variables based on deployment_type - include_vars: "{{ item }}" + 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 elasticsearch_prefix image facts +- name: Set elasticsearch image facts set_fact: openshift_logging_elasticsearch_proxy_image_prefix: "{{ openshift_logging_elasticsearch_proxy_image_prefix | default(__openshift_logging_elasticsearch_proxy_image_prefix) }}" openshift_logging_elasticsearch_proxy_image_version: "{{ openshift_logging_elasticsearch_proxy_image_version | default(__openshift_logging_elasticsearch_proxy_image_version) }}" + openshift_logging_elasticsearch_image_prefix: "{{ openshift_logging_elasticsearch_image_prefix | default(__openshift_logging_elasticsearch_image_prefix) }}" + openshift_logging_elasticsearch_image_version: "{{ openshift_logging_elasticsearch_image_version | default(__openshift_logging_elasticsearch_image_version) }}" + +- include: determine_version.yaml # allow passing in a tempdir - name: Create temp directory for doing work in |