summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-08 11:40:40 -0500
committerGitHub <noreply@github.com>2016-11-08 11:40:40 -0500
commitb2463234e9d7431d09987e97660381d2ae403211 (patch)
tree342ab702b1e09258bfdc1af41a879163033e1b43 /roles/openshift_facts
parentbe5fbab1e3c11458f7ec979346e627923f3efe79 (diff)
parent9e737af5bd7a8465bab2b4fd471933cb3f63cd3a (diff)
downloadopenshift-b2463234e9d7431d09987e97660381d2ae403211.tar.gz
openshift-b2463234e9d7431d09987e97660381d2ae403211.tar.bz2
openshift-b2463234e9d7431d09987e97660381d2ae403211.tar.xz
openshift-b2463234e9d7431d09987e97660381d2ae403211.zip
Merge pull request #2753 from jkhelil/proxy_settings
Always add local dns domain to no_proxy
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index cd6b6456b..537b6c60f 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1520,8 +1520,8 @@ def set_proxy_facts(facts):
safe_get_bool(common['generate_no_proxy_hosts']):
if 'no_proxy_internal_hostnames' in common:
common['no_proxy'].extend(common['no_proxy_internal_hostnames'].split(','))
- common['no_proxy'].append('.' + common['dns_domain'])
- # We always add ourselves no matter what
+ # We always add local dns domain and ourselves no matter what
+ common['no_proxy'].append('.' + common['dns_domain'])
common['no_proxy'].append(common['hostname'])
common['no_proxy'] = sort_unique(common['no_proxy'])
facts['common'] = common