summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Bielawa <tbielawa@redhat.com>2016-08-26 11:53:00 -0700
committerTim Bielawa <tbielawa@redhat.com>2016-08-26 11:53:00 -0700
commit07cf1d6213b0d288761bfe3a31c1d44cdddbdd93 (patch)
tree41d3e7860de545e66e3cb78e4fae476edf265966
parent615b42f66da4f0e3e6a3516a0d859a7842db5ec4 (diff)
downloadopenshift-07cf1d6213b0d288761bfe3a31c1d44cdddbdd93.tar.gz
openshift-07cf1d6213b0d288761bfe3a31c1d44cdddbdd93.tar.bz2
openshift-07cf1d6213b0d288761bfe3a31c1d44cdddbdd93.tar.xz
openshift-07cf1d6213b0d288761bfe3a31c1d44cdddbdd93.zip
Try using parse_version from pkg_resources instead
-rw-r--r--utils/src/ooinstall/cli_installer.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 9420ec287..6b81f7721 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -6,8 +6,8 @@ import os
import re
import sys
import logging
-import setuptools.version
import click
+from pkg_resources import parse_version
from ooinstall import openshift_ansible
from ooinstall.oo_config import OOConfig
from ooinstall.oo_config import OOConfigInvalidHostError
@@ -631,9 +631,9 @@ https://docs.openshift.com/enterprise/latest/admin_guide/install/prerequisites.h
oo_cfg.deployment.variables['master_routingconfig_subdomain'] = get_master_routingconfig_subdomain()
click.clear()
- current_version = setuptools.version.pkg_resources.parse_version(
+ current_version = parse_version(
oo_cfg.settings.get('variant_version', '0.0'))
- min_version = setuptools.version.pkg_resources.parse_version('3.2')
+ min_version = parse_version('3.2')
if not oo_cfg.settings.get('openshift_http_proxy', None) and \
current_version >= min_version:
http_proxy, https_proxy, proxy_excludes = get_proxy_hostnames_and_excludes()