diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-04-25 15:31:18 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-04-25 15:31:18 -0400 |
| commit | 337b9e4a842cfd7ec6705fd1501cc9c2991a694f (patch) | |
| tree | 67bdb2c745ecc736de7b62df50095a5b3cc59176 /roles/openshift_facts/tasks | |
| parent | b90fb397908c4e5f9001724e7f8ddcc25f4ffdea (diff) | |
| parent | 3262718f8fc4658a3b223823244f1f78cb0eb6c8 (diff) | |
| download | openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.tar.gz openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.tar.bz2 openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.tar.xz openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.zip | |
Merge branch 'master' into issue1800
Diffstat (limited to 'roles/openshift_facts/tasks')
| -rw-r--r-- | roles/openshift_facts/tasks/main.yml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml index 36def57c8..7510e4e39 100644 --- a/roles/openshift_facts/tasks/main.yml +++ b/roles/openshift_facts/tasks/main.yml @@ -33,3 +33,18 @@ is_containerized: "{{ l_is_containerized | default(None) }}" public_hostname: "{{ openshift_public_hostname | default(None) }}" public_ip: "{{ openshift_public_ip | 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'] + | union(groups['oo_masters_to_config']) + | union(groups['oo_etcd_to_config'] | default([]))) + | oo_collect('openshift.common.hostname') | default([]) | join (',') + }}" |