Move version greater_than_fact into openshift_facts

1 files changed, 8 insertions, 2 deletions

diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 3570de693..d0388e6fe 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -20,6 +20,7 @@ EXAMPLES = '''
 import ConfigParser
 import copy
 import os
+from ansible.runner.filter_plugins.core import version_compare
 from distutils.util import strtobool
 
 
@@ -501,7 +502,12 @@ 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 deployment_type == 'origin':
+            version_gt_3_1_or_1_1 = version_compare(version, '1.0.6', '>')
+        else:
+            version_gt_3_1_or_1_1 = version_compare(version, '3.0.2', '>')
+        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:
@@ -632,7 +638,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'])