summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_elasticsearch
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2017-12-21 15:53:30 -0500
committerGitHub <noreply@github.com>2017-12-21 15:53:30 -0500
commitfbf32e8e992a5de1cb5fa9cacba9224658b5c0a4 (patch)
tree54d9187a470cd044be9406e97d47ca5989411570 /roles/openshift_logging_elasticsearch
parent0300b611877689e9f14ad5714b1e4e2c7224ca1e (diff)
parente3cf9edff6d0186b09b1a112592f283fab6857d0 (diff)
downloadopenshift-fbf32e8e992a5de1cb5fa9cacba9224658b5c0a4.tar.gz
openshift-fbf32e8e992a5de1cb5fa9cacba9224658b5c0a4.tar.bz2
openshift-fbf32e8e992a5de1cb5fa9cacba9224658b5c0a4.tar.xz
openshift-fbf32e8e992a5de1cb5fa9cacba9224658b5c0a4.zip
Merge pull request #6530 from mgugino-upstream-stage/init-task-trim
Move sanity_checks into custom action plugin
Diffstat (limited to 'roles/openshift_logging_elasticsearch')
-rw-r--r--roles/openshift_logging_elasticsearch/tasks/main.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_elasticsearch/tasks/main.yaml b/roles/openshift_logging_elasticsearch/tasks/main.yaml
index 7790dc435..6ddeb122e 100644
--- a/roles/openshift_logging_elasticsearch/tasks/main.yaml
+++ b/roles/openshift_logging_elasticsearch/tasks/main.yaml
@@ -15,10 +15,10 @@
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', '') ) }}"
-- name: Set default image variables based on deployment_type
+- name: Set default image variables based on openshift_deployment_type
include_vars: "{{ var_file_name }}"
with_first_found:
- - "{{ openshift_deployment_type | default(deployment_type) }}.yml"
+ - "{{ openshift_deployment_type }}.yml"
- "default_images.yml"
loop_control:
loop_var: var_file_name