Merge pull request #6215 from sdodson/bz1511870

Automatic merge from submit-queue.

Add kube service ipaddress to no_proxy list

Computed as the first ip address in the portal_net

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1511870

2 files changed, 5 insertions, 0 deletions

diff --git a/playbooks/init/base_packages.yml b/playbooks/init/base_packages.yml
index e1052fb6c..0a730a88a 100644
--- a/playbooks/init/base_packages.yml
+++ b/playbooks/init/base_packages.yml
@@ -16,6 +16,7 @@
       - iproute
       - "{{ 'python3-dbus' if ansible_distribution == 'Fedora' else 'dbus-python' }}"
       - "{{ 'python3-PyYAML' if ansible_distribution == 'Fedora' else 'PyYAML' }}"
+      - "{{ 'python-ipaddress' if ansible_distribution != 'Fedora' else omit }}"
       - yum-utils
       register: result
       until: result is succeeded
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index d6d31effd..452cc4ef6 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -15,8 +15,10 @@ import os
 import yaml
 import struct
 import socket
+import ipaddress
 from distutils.util import strtobool
 from distutils.version import LooseVersion
+from ansible.module_utils.six import u
 from ansible.module_utils.six import string_types
 from ansible.module_utils.six.moves import configparser
 
@@ -1146,6 +1148,8 @@ def set_proxy_facts(facts):
                 if 'no_proxy_internal_hostnames' in common:
                     common['no_proxy'].extend(common['no_proxy_internal_hostnames'].split(','))
             # We always add local dns domain and ourselves no matter what
+            kube_svc_ip = str(ipaddress.ip_network(u(common['portal_net']))[1])
+            common['no_proxy'].append(kube_svc_ip)
             common['no_proxy'].append('.' + common['dns_domain'])
             common['no_proxy'].append('.svc')
             common['no_proxy'].append(common['hostname'])