diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-05-12 15:18:45 -0400 |
|---|---|---|
| committer | Samuel Munilla <smunilla@redhat.com> | 2016-05-16 15:35:09 -0400 |
| commit | f93a90b954c493830ef0ac4cfd9c5cc6b0634033 (patch) | |
| tree | e96de093fc7f6084c6911f62be93979dc78b0d5c | |
| parent | 6600c694bedf88a246c0f8a2cccb9ae3c34dc6ea (diff) | |
| download | openshift-f93a90b954c493830ef0ac4cfd9c5cc6b0634033.tar.gz openshift-f93a90b954c493830ef0ac4cfd9c5cc6b0634033.tar.bz2 openshift-f93a90b954c493830ef0ac4cfd9c5cc6b0634033.tar.xz openshift-f93a90b954c493830ef0ac4cfd9c5cc6b0634033.zip | |
a-o-i: No proxy questions for 3.0/3.1
Global proxies were not supported until 3.2 so if a
lesser version is specified then we don't need to
ask for it.
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 4 |
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 |