summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-05-17 16:33:39 -0400
committerJason DeTiberus <detiber@gmail.com>2016-05-17 16:33:39 -0400
commit1826e93bcf2ba21f0c1c7368dffd091a8bfbf142 (patch)
tree4edd751ae9ef24fb44140367338342ae42cbafd2 /utils
parent74187bfa9e9c1529075fc481b1b0e3083b7870df (diff)
parentf93a90b954c493830ef0ac4cfd9c5cc6b0634033 (diff)
downloadopenshift-1826e93bcf2ba21f0c1c7368dffd091a8bfbf142.tar.gz
openshift-1826e93bcf2ba21f0c1c7368dffd091a8bfbf142.tar.bz2
openshift-1826e93bcf2ba21f0c1c7368dffd091a8bfbf142.tar.xz
openshift-1826e93bcf2ba21f0c1c7368dffd091a8bfbf142.zip
Merge pull request #1886 from smunilla/BZ1331239
a-o-i: No proxy questions for 3.0/3.1
Diffstat (limited to 'utils')
-rw-r--r--utils/src/ooinstall/cli_installer.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index eacf340aa..c896a74b4 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -11,6 +11,7 @@ from ooinstall import OOConfig
from ooinstall.oo_config import OOConfigInvalidHostError
from ooinstall.oo_config import Host
from ooinstall.variants import find_variant, get_variant_version_combos
+from distutils.version import LooseVersion
DEFAULT_ANSIBLE_CONFIG = '/usr/share/atomic-openshift-utils/ansible.cfg'
DEFAULT_PLAYBOOK_DIR = '/usr/share/ansible/openshift-ansible/'
@@ -594,7 +595,8 @@ https://docs.openshift.com/enterprise/latest/admin_guide/install/prerequisites.h
oo_cfg.settings['master_routingconfig_subdomain'] = get_master_routingconfig_subdomain()
click.clear()
- if not oo_cfg.settings.get('openshift_http_proxy', None):
+ if not oo_cfg.settings.get('openshift_http_proxy', None) and \
+ LooseVersion(oo_cfg.settings.get('variant_version', '0.0')) >= LooseVersion('3.2'):
http_proxy, https_proxy, proxy_excludes = get_proxy_hostnames_and_excludes()
oo_cfg.settings['openshift_http_proxy'] = http_proxy
oo_cfg.settings['openshift_https_proxy'] = https_proxy