diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-07-05 13:38:43 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 13:38:43 -0400 | 
| commit | d53cf7945bd06f32cde91d8978e2c0ac7d60e14a (patch) | |
| tree | 32808fb87b728a33bb158daec4929fe17defa984 /roles | |
| parent | b6825faa915900790e3d0a18f6130f90c457d15c (diff) | |
| parent | 4defbe2ab6bf2dd176951e4400d85092be747ab5 (diff) | |
| download | openshift-d53cf7945bd06f32cde91d8978e2c0ac7d60e14a.tar.gz openshift-d53cf7945bd06f32cde91d8978e2c0ac7d60e14a.tar.bz2 openshift-d53cf7945bd06f32cde91d8978e2c0ac7d60e14a.tar.xz openshift-d53cf7945bd06f32cde91d8978e2c0ac7d60e14a.zip | |
Merge pull request #4678 from tbielawa/bz1467776
Merged by openshift-bot
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 30701a518..c960630ed 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1657,7 +1657,9 @@ def set_proxy_facts(facts):          # at this point common['no_proxy'] is a LIST datastructure. It          # may be empty, or it may contain some hostnames or ranges. -        # We always add local dns domain and ourselves no matter what +        # We always add local dns domain, the service domain, and +        # ourselves, no matter what +        common['no_proxy'].append('.svc')          common['no_proxy'].append('.' + common['dns_domain'])          common['no_proxy'].append(common['hostname']) | 
