summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-10-27 10:07:20 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-10-27 10:07:20 -0400
commitfcbb48362afb6e9ed196d7833940877bbc0296ae (patch)
treed0bce8760facae32438342007cb568afcf27e3ad /roles/openshift_facts/library
parent2f02c464904551e8018e0afc47bcde850ed8d0f1 (diff)
parent05458ecde01c9c1ade9d1a5216bc7621a92b9d6f (diff)
downloadopenshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.tar.gz
openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.tar.bz2
openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.tar.xz
openshift-fcbb48362afb6e9ed196d7833940877bbc0296ae.zip
Merge pull request #731 from abutcher/proxy-client-config
Add proxy client certs to master config
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 3afbbbbb3..67994d11d 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -21,6 +21,7 @@ import ConfigParser
import copy
import os
from distutils.util import strtobool
+from distutils.version import LooseVersion
def hostname_valid(hostname):
@@ -528,7 +529,15 @@ def set_deployment_facts_if_unset(facts):
if deployment_type in ['enterprise', 'online']:
data_dir = '/var/lib/openshift'
facts['common']['data_dir'] = data_dir
- facts['common']['version'] = get_openshift_version()
+ facts['common']['version'] = version = get_openshift_version()
+ if version is not None:
+ if deployment_type == 'origin':
+ version_gt_3_1_or_1_1 = LooseVersion(version) > LooseVersion('1.0.6')
+ else:
+ version_gt_3_1_or_1_1 = LooseVersion(version) > LooseVersion('3.0.2')
+ else:
+ version_gt_3_1_or_1_1 = True
+ facts['common']['version_greater_than_3_1_or_1_1'] = version_gt_3_1_or_1_1
for role in ('master', 'node'):
if role in facts:
@@ -659,7 +668,7 @@ def get_openshift_version():
Returns:
version: the current openshift version
"""
- version = ''
+ version = None
if os.path.isfile('/usr/bin/openshift'):
_, output, _ = module.run_command(['/usr/bin/openshift', 'version'])