summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2016-01-07 15:15:22 -0500
committerSamuel Munilla <smunilla@redhat.com>2016-06-23 10:14:37 -0400
commit3c9f09107e22a05a6a63e2789b7df266d1ee5a5f (patch)
treee2a01569d97c8e20f3ccf2bf28ffeb0570f86054
parent7ac20f9cef4dbbf9787e757dd1938d28483a22a7 (diff)
downloadopenshift-3c9f09107e22a05a6a63e2789b7df266d1ee5a5f.tar.gz
openshift-3c9f09107e22a05a6a63e2789b7df266d1ee5a5f.tar.bz2
openshift-3c9f09107e22a05a6a63e2789b7df266d1ee5a5f.tar.xz
openshift-3c9f09107e22a05a6a63e2789b7df266d1ee5a5f.zip
a-o-i: Add support for installing OpenShift Origin
Allow the user to specify origin install in unattended mode.s
-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..de7e90f27 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.1', '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