From b6190a17b578de72147e481b0eea00aca59adc2f Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Fri, 21 Apr 2017 13:30:53 -0400 Subject: 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 }}" --- roles/openshift_logging/tasks/generate_routes.yaml | 6 +++--- roles/openshift_logging/tasks/main.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'roles/openshift_logging') 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 }}" -- cgit v1.2.1