summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-04-21 13:30:53 -0400
committerScott Dodson <sdodson@redhat.com>2017-05-01 11:03:49 -0400
commitb6190a17b578de72147e481b0eea00aca59adc2f (patch)
tree837fc471c415f4fb92bbba7307daa7e0fba2f6e3 /roles/openshift_logging
parenta3f5c0ce84f32ada05d718d3e6e5a505ec0f9221 (diff)
downloadopenshift-b6190a17b578de72147e481b0eea00aca59adc2f.tar.gz
openshift-b6190a17b578de72147e481b0eea00aca59adc2f.tar.bz2
openshift-b6190a17b578de72147e481b0eea00aca59adc2f.tar.xz
openshift-b6190a17b578de72147e481b0eea00aca59adc2f.zip
Remove jinja template delimeters from when conditions
In ansible 2.3 "[WARNING]: when statements should not include jinja2 templating delimiters such as {{ }} or {% %}. Found: {{ g_glusterfs_hosts is not defined }}"
Diffstat (limited to 'roles/openshift_logging')
-rw-r--r--roles/openshift_logging/tasks/generate_routes.yaml6
-rw-r--r--roles/openshift_logging/tasks/main.yaml2
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_logging/tasks/generate_routes.yaml b/roles/openshift_logging/tasks/generate_routes.yaml
index e77da7a24..d65fa0de9 100644
--- a/roles/openshift_logging/tasks/generate_routes.yaml
+++ b/roles/openshift_logging/tasks/generate_routes.yaml
@@ -1,14 +1,14 @@
---
- set_fact: kibana_key={{ lookup('file', openshift_logging_kibana_key) | b64encode }}
- when: "{{ openshift_logging_kibana_key | trim | length > 0 }}"
+ when: "openshift_logging_kibana_key | trim | length > 0"
changed_when: false
- set_fact: kibana_cert={{ lookup('file', openshift_logging_kibana_cert)| b64encode }}
- when: "{{openshift_logging_kibana_cert | trim | length > 0}}"
+ when: "openshift_logging_kibana_cert | trim | length > 0"
changed_when: false
- set_fact: kibana_ca={{ lookup('file', openshift_logging_kibana_ca)| b64encode }}
- when: "{{openshift_logging_kibana_ca | trim | length > 0}}"
+ when: "openshift_logging_kibana_ca | trim | length > 0"
changed_when: false
- set_fact: kibana_ca={{key_pairs | entry_from_named_pair('ca_file') }}
diff --git a/roles/openshift_logging/tasks/main.yaml b/roles/openshift_logging/tasks/main.yaml
index c7f4a2f93..b1c84aa1f 100644
--- a/roles/openshift_logging/tasks/main.yaml
+++ b/roles/openshift_logging/tasks/main.yaml
@@ -1,7 +1,7 @@
---
- fail:
msg: Only one Fluentd nodeselector key pair should be provided
- when: "{{ openshift_logging_fluentd_nodeselector.keys() | count }} > 1"
+ when: "openshift_logging_fluentd_nodeselector.keys() | count > 1"
- name: Set default image variables based on deployment_type
include_vars: "{{ item }}"