diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-05-16 17:10:07 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-05-17 17:14:52 -0400 |
| commit | 0118ca424ea4f23765c01d982b0e810b82fd8860 (patch) | |
| tree | d44aec4468940f88fbdbe8d0d6894f365cad7980 /roles | |
| parent | d6e301e776ce631e13d8148041ecd86d23c543fb (diff) | |
| download | openshift-0118ca424ea4f23765c01d982b0e810b82fd8860.tar.gz openshift-0118ca424ea4f23765c01d982b0e810b82fd8860.tar.bz2 openshift-0118ca424ea4f23765c01d982b0e810b82fd8860.tar.xz openshift-0118ca424ea4f23765c01d982b0e810b82fd8860.zip | |
Refactor where we compute no_proxy hostnames
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_facts/tasks/main.yml | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml index 47a82a968..f092f021f 100644 --- a/roles/openshift_facts/tasks/main.yml +++ b/roles/openshift_facts/tasks/main.yml @@ -32,18 +32,8 @@ public_hostname: "{{ openshift_public_hostname | default(None) }}" public_ip: "{{ openshift_public_ip | default(None) }}" portal_net: "{{ openshift_portal_net | default(openshift_master_portal_net) | default(None) }}" - -# had to be done outside of the above because hostname isn't yet set -- name: Gather hostnames for proxy configuration - openshift_facts: - role: common - local_facts: http_proxy: "{{ openshift_http_proxy | default(None) }}" https_proxy: "{{ openshift_https_proxy | default(None) }}" no_proxy: "{{ openshift_no_proxy | default(None) }}" generate_no_proxy_hosts: "{{ openshift_generate_no_proxy_hosts | default(True) }}" - no_proxy_internal_hostnames: "{{ hostvars | oo_select_keys(groups['oo_nodes_to_config'] | default([]) - | union(groups['oo_masters_to_config'] | default([]) ) - | union(groups['oo_etcd_to_config'] | default([]))) - | oo_collect('openshift.common.hostname') | default([]) | join (',') - }}" + no_proxy_internal_hostnames: "{{ openshift_no_proxy_internal_hostnames | default(None) }}" |