diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-05-18 12:28:01 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-05-18 12:28:01 -0400 |
| commit | cdf802ec89c46400896d94a7a1f426655b5a21db (patch) | |
| tree | d44aec4468940f88fbdbe8d0d6894f365cad7980 /playbooks/common/openshift-node | |
| parent | 1826e93bcf2ba21f0c1c7368dffd091a8bfbf142 (diff) | |
| parent | 0118ca424ea4f23765c01d982b0e810b82fd8860 (diff) | |
| download | openshift-cdf802ec89c46400896d94a7a1f426655b5a21db.tar.gz openshift-cdf802ec89c46400896d94a7a1f426655b5a21db.tar.bz2 openshift-cdf802ec89c46400896d94a7a1f426655b5a21db.tar.xz openshift-cdf802ec89c46400896d94a7a1f426655b5a21db.zip | |
Merge pull request #1900 from sdodson/fix-rhel_subscribe
Fix rhel_subscribe
Diffstat (limited to 'playbooks/common/openshift-node')
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index a41fca45a..b3491ef8d 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -116,6 +116,13 @@ openshift_node_master_api_url: "{{ hostvars[groups.oo_first_master.0].openshift.master.api_url }}" openshift_node_first_master_ip: "{{ hostvars[groups.oo_first_master.0].openshift.common.ip }}" 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 }}" roles: - openshift_node @@ -125,6 +132,13 @@ openshift_node_master_api_url: "{{ hostvars[groups.oo_first_master.0].openshift.master.api_url }}" openshift_node_first_master_ip: "{{ hostvars[groups.oo_first_master.0].openshift.common.ip }}" 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 }}" roles: - openshift_node |