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 /playbooks/common/openshift-cluster/upgrades/v3_3 | |
| 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 'playbooks/common/openshift-cluster/upgrades/v3_3')
3 files changed, 9 insertions, 6 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_3/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_3/upgrade.yml index f1245aa2e..0f6fb46a4 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_3/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_3/upgrade.yml @@ -39,8 +39,9 @@ | union(groups['oo_etcd_to_config'] | default([]))) | oo_collect('openshift.common.hostname') | default([]) | join (',') }}" - when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and - openshift_generate_no_proxy_hosts | default(True) | bool }}" + when: + - openshift_http_proxy is defined or openshift_https_proxy is defined + - openshift_generate_no_proxy_hosts | default(True) | bool - include: ../pre/verify_inventory_vars.yml tags: diff --git a/playbooks/common/openshift-cluster/upgrades/v3_3/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/v3_3/upgrade_control_plane.yml index b693ab55c..cfba788a8 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_3/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_3/upgrade_control_plane.yml @@ -47,8 +47,9 @@ | union(groups['oo_etcd_to_config'] | default([]))) | oo_collect('openshift.common.hostname') | default([]) | join (',') }}" - when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and - openshift_generate_no_proxy_hosts | default(True) | bool }}" + when: + - openshift_http_proxy is defined or openshift_https_proxy is defined + - openshift_generate_no_proxy_hosts | default(True) | bool - include: ../pre/verify_inventory_vars.yml tags: diff --git a/playbooks/common/openshift-cluster/upgrades/v3_3/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/v3_3/upgrade_nodes.yml index 4fd029107..1054f430e 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_3/upgrade_nodes.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_3/upgrade_nodes.yml @@ -40,8 +40,9 @@ | union(groups['oo_etcd_to_config'] | default([]))) | oo_collect('openshift.common.hostname') | default([]) | join (',') }}" - when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and - openshift_generate_no_proxy_hosts | default(True) | bool }}" + when: + - openshift_http_proxy is defined or openshift_https_proxy is defined + - openshift_generate_no_proxy_hosts | default(True) | bool - include: ../pre/verify_inventory_vars.yml tags: |