summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-07-13 22:21:20 -0400
committerGitHub <noreply@github.com>2016-07-13 22:21:20 -0400
commit2a662d44477c8215c3754a5b604a1206a6453052 (patch)
tree06f51176560e1b169fa4ea340e863edde97cbb92
parenta9870821719dfe28cd4b58dfe2709c39dc9cf4c9 (diff)
parent23dd2653ef965926a192a009947f23f1578c2f59 (diff)
downloadopenshift-2a662d44477c8215c3754a5b604a1206a6453052.tar.gz
openshift-2a662d44477c8215c3754a5b604a1206a6453052.tar.bz2
openshift-2a662d44477c8215c3754a5b604a1206a6453052.tar.xz
openshift-2a662d44477c8215c3754a5b604a1206a6453052.zip
Merge pull request #1135 from smunilla/origin-installs
atomic-openshift-installer: Add support for installing OpenShift Orgin
-rw-r--r--utils/src/ooinstall/variants.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/utils/src/ooinstall/variants.py b/utils/src/ooinstall/variants.py
index 9d98379bb..8889e42e6 100644
--- a/utils/src/ooinstall/variants.py
+++ b/utils/src/ooinstall/variants.py
@@ -33,7 +33,7 @@ class Variant(object):
return self.versions[0]
-# WARNING: Keep the versions ordered, most recent last:
+# WARNING: Keep the versions ordered, most recent first:
OSE = Variant('openshift-enterprise', 'OpenShift Enterprise',
[
Version('3.2', 'openshift-enterprise'),
@@ -49,9 +49,15 @@ AEP = Variant('atomic-enterprise', 'Atomic Enterprise Platform',
]
)
-# Ordered list of variants we can install, first is the default.
-SUPPORTED_VARIANTS = (OSE, AEP)
+origin = Variant('origin', 'OpenShift Origin',
+ [
+ Version('1.2', 'origin'),
+ ]
+)
+# Ordered list of variants we can install, first is the default.
+SUPPORTED_VARIANTS = (OSE, AEP, origin)
+DISPLAY_VARIANTS = (OSE, AEP)
def find_variant(name, version=None):
"""
@@ -72,7 +78,7 @@ def find_variant(name, version=None):
def get_variant_version_combos():
combos = []
- for variant in SUPPORTED_VARIANTS:
+ for variant in DISPLAY_VARIANTS:
for ver in variant.versions:
combos.append((variant, ver))
return combos