summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-05-16 17:10:07 -0400
committerScott Dodson <sdodson@redhat.com>2016-05-17 17:14:52 -0400
commit0118ca424ea4f23765c01d982b0e810b82fd8860 (patch)
treed44aec4468940f88fbdbe8d0d6894f365cad7980 /playbooks/common/openshift-master
parentd6e301e776ce631e13d8148041ecd86d23c543fb (diff)
downloadopenshift-0118ca424ea4f23765c01d982b0e810b82fd8860.tar.gz
openshift-0118ca424ea4f23765c01d982b0e810b82fd8860.tar.bz2
openshift-0118ca424ea4f23765c01d982b0e810b82fd8860.tar.xz
openshift-0118ca424ea4f23765c01d982b0e810b82fd8860.zip
Refactor where we compute no_proxy hostnames
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/config.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 91d66a9cb..125aab0ae 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -348,6 +348,13 @@
openshift_master_session_auth_secrets: "{{ hostvars[groups.oo_first_master.0].openshift.master.session_auth_secrets }}"
openshift_master_session_encryption_secrets: "{{ hostvars[groups.oo_first_master.0].openshift.master.session_encryption_secrets }}"
openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}"
+ openshift_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 (',')
+ }}"
+ when: "{{ (openshift_http_proxy is defined or openshift_https_proxy is defined) and
+ openshift_generate_no_proxy_hosts | default(True) | bool }}"
pre_tasks:
- name: Ensure certificate directory exists
file: