diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-11 09:26:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 09:26:53 -0400 |
| commit | 372d55eaa811c3faaad36ac65150a5bf2e639812 (patch) | |
| tree | 284f5f4eb25b31661d70a9eccfd542e84610de02 /roles | |
| parent | 9902edb3acc93867afa0a579dc52978d9da35365 (diff) | |
| parent | c84f11d71f89ae9ac0c93f3da4f74c742346612e (diff) | |
| download | openshift-372d55eaa811c3faaad36ac65150a5bf2e639812.tar.gz openshift-372d55eaa811c3faaad36ac65150a5bf2e639812.tar.bz2 openshift-372d55eaa811c3faaad36ac65150a5bf2e639812.tar.xz openshift-372d55eaa811c3faaad36ac65150a5bf2e639812.zip | |
Merge pull request #5047 from rhcarvalho/fix-when-warning
Fix syntax for when statement
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_logging_fluentd/tasks/main.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_logging_kibana/tasks/main.yaml | 6 | ||||
| -rw-r--r-- | roles/openshift_provisioners/tasks/install_efs.yaml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_logging_fluentd/tasks/main.yaml b/roles/openshift_logging_fluentd/tasks/main.yaml index 9dfc6fc86..74b4d7db4 100644 --- a/roles/openshift_logging_fluentd/tasks/main.yaml +++ b/roles/openshift_logging_fluentd/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 - fail: msg: Application logs destination is required diff --git a/roles/openshift_logging_kibana/tasks/main.yaml b/roles/openshift_logging_kibana/tasks/main.yaml index 62bc26e37..166f102f7 100644 --- a/roles/openshift_logging_kibana/tasks/main.yaml +++ b/roles/openshift_logging_kibana/tasks/main.yaml @@ -99,17 +99,17 @@ # TODO: set up these certs differently? - 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: diff --git a/roles/openshift_provisioners/tasks/install_efs.yaml b/roles/openshift_provisioners/tasks/install_efs.yaml index b53b6afa1..4a6e00513 100644 --- a/roles/openshift_provisioners/tasks/install_efs.yaml +++ b/roles/openshift_provisioners/tasks/install_efs.yaml @@ -67,4 +67,4 @@ register: efs_output failed_when: efs_output.rc == 1 and 'exists' not in efs_output.stderr check_mode: no - when: efs_anyuid.stdout.find("system:serviceaccount:{{openshift_provisioners_project}}:provisioners-efs") == -1 + when: efs_anyuid.stdout.find("system:serviceaccount:" + openshift_provisioners_project + ":provisioners-efs") == -1 |