diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-26 16:26:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-26 16:26:55 -0400 |
| commit | 1cd89648269a483d464caef3f700b10cf68ea1c4 (patch) | |
| tree | 70583be4f2abbc27ec3c745deb45ceb0b96fb8bc /playbooks/common/openshift-node | |
| parent | d9512d95e8cc645f7dd12ffb0ab22fb80425ec51 (diff) | |
| parent | 8e3ddd2418659a79344dfb609e26d663122e1294 (diff) | |
| download | openshift-1cd89648269a483d464caef3f700b10cf68ea1c4.tar.gz openshift-1cd89648269a483d464caef3f700b10cf68ea1c4.tar.bz2 openshift-1cd89648269a483d464caef3f700b10cf68ea1c4.tar.xz openshift-1cd89648269a483d464caef3f700b10cf68ea1c4.zip | |
Merge pull request #4448 from mtnbikenc/vars-syntax
Remove invalid when: from vars:
Diffstat (limited to 'playbooks/common/openshift-node')
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index acebabc91..501ba4273 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -47,8 +47,7 @@ | 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 }}" + roles: - role: openshift_node openshift_ca_host: "{{ groups.oo_first_master.0 }}" @@ -64,8 +63,6 @@ | 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 }}" roles: - role: openshift_node openshift_ca_host: "{{ groups.oo_first_master.0 }}" |