diff options
| -rw-r--r-- | utils/src/ooinstall/variants.py | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/utils/src/ooinstall/variants.py b/utils/src/ooinstall/variants.py index ce4d772ee..c723c7e61 100644 --- a/utils/src/ooinstall/variants.py +++ b/utils/src/ooinstall/variants.py @@ -38,29 +38,30 @@ class Variant(object): # WARNING: Keep the versions ordered, most recent first: OSE = Variant('openshift-enterprise', 'OpenShift Container Platform', - [ - Version('3.3', 'openshift-enterprise'), - ] + [ + Version('3.3', 'openshift-enterprise'), + ] ) origin = Variant('origin', 'OpenShift Origin', - [ - Version('1.2', 'origin'), - ] + [ + Version('1.2', 'origin'), + ] ) LEGACY = Variant('openshift-enterprise', 'OpenShift Container Platform', - [ - Version('3.2', 'openshift-enterprise'), - Version('3.1', 'openshift-enterprise'), - Version('3.0', 'openshift-enterprise'), - ] + [ + Version('3.2', 'openshift-enterprise'), + Version('3.1', 'openshift-enterprise'), + Version('3.0', 'openshift-enterprise'), + ] ) # Ordered list of variants we can install, first is the default. SUPPORTED_VARIANTS = (OSE, origin, LEGACY) DISPLAY_VARIANTS = (OSE, ) + def find_variant(name, version=None): """ Locate the variant object for the variant given in config file, and @@ -78,6 +79,7 @@ def find_variant(name, version=None): return (None, None) + def get_variant_version_combos(): combos = [] for variant in DISPLAY_VARIANTS: |