diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-12-19 13:08:55 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-19 13:08:55 -0500 |
commit | 151115eaf18d557aa8f770e61820e10bed4109bc (patch) | |
tree | 2d8a7305669b242ec1c03a06ecb5cf3238dec688 /playbooks/common/openshift-cluster/upgrades/pre/config.yml | |
parent | 7ab8e67bfc62e16466e3fd211fded63f16583403 (diff) | |
parent | 801779eeb6f6308f81ae7c48409de7686c04a0aa (diff) | |
download | openshift-151115eaf18d557aa8f770e61820e10bed4109bc.tar.gz openshift-151115eaf18d557aa8f770e61820e10bed4109bc.tar.bz2 openshift-151115eaf18d557aa8f770e61820e10bed4109bc.tar.xz openshift-151115eaf18d557aa8f770e61820e10bed4109bc.zip |
Merge pull request #6469 from mgugino-upstream-stage/plugin-consolidate
Plugin consolidate
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/pre/config.yml')
-rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/config.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/config.yml b/playbooks/common/openshift-cluster/upgrades/pre/config.yml index d5b82d9a0..de74c8ab8 100644 --- a/playbooks/common/openshift-cluster/upgrades/pre/config.yml +++ b/playbooks/common/openshift-cluster/upgrades/pre/config.yml @@ -14,10 +14,10 @@ hosts: "{{ l_upgrade_no_proxy_hosts }}" tasks: - set_fact: - openshift_no_proxy_internal_hostnames: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config'] + openshift_no_proxy_internal_hostnames: "{{ hostvars | lib_utils_oo_select_keys(groups['oo_nodes_to_config'] | union(groups['oo_masters_to_config']) | union(groups['oo_etcd_to_config'] | default([]))) - | oo_collect('openshift.common.hostname') | default([]) | join (',') + | lib_utils_oo_collect('openshift.common.hostname') | default([]) | join (',') }}" when: - openshift_http_proxy is defined or openshift_https_proxy is defined |