diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-26 10:42:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-26 10:42:47 -0400 |
| commit | 577195e3eefe19b95e39f0f52834cd3dc8f77cdf (patch) | |
| tree | 435ba7aa27211183036e2a88ad6222b190ea86f2 /utils/src/ooinstall/variants.py | |
| parent | b8e72ea2143834317043f19cbc3dddf8ad9047a5 (diff) | |
| parent | 08016cf607b9111a10acabc118551e6d24e88628 (diff) | |
| download | openshift-577195e3eefe19b95e39f0f52834cd3dc8f77cdf.tar.gz openshift-577195e3eefe19b95e39f0f52834cd3dc8f77cdf.tar.bz2 openshift-577195e3eefe19b95e39f0f52834cd3dc8f77cdf.tar.xz openshift-577195e3eefe19b95e39f0f52834cd3dc8f77cdf.zip | |
Merge pull request #2363 from tbielawa/pep8_fixes_for_quick_installer
Pep8 fixes for quick installer
Diffstat (limited to 'utils/src/ooinstall/variants.py')
| -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: |