From 3c9f09107e22a05a6a63e2789b7df266d1ee5a5f Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Thu, 7 Jan 2016 15:15:22 -0500 Subject: a-o-i: Add support for installing OpenShift Origin Allow the user to specify origin install in unattended mode.s --- utils/src/ooinstall/variants.py | 14 ++++++++++---- 1 file 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 -- cgit v1.2.3 From 7f5387232dade14a3023c3f78c0306e3ad15d773 Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Wed, 15 Jun 2016 10:33:15 -0400 Subject: a-o-i: Add Origin 1.2 Installs Add Origin 1.2 as one of the available installation options. --- utils/src/ooinstall/variants.py | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/src/ooinstall/variants.py b/utils/src/ooinstall/variants.py index de7e90f27..faa8ad747 100644 --- a/utils/src/ooinstall/variants.py +++ b/utils/src/ooinstall/variants.py @@ -51,6 +51,7 @@ AEP = Variant('atomic-enterprise', 'Atomic Enterprise Platform', origin = Variant('origin', 'OpenShift Origin', [ + Version('1.2', 'origin'), Version('1.1', 'origin') ] ) -- cgit v1.2.3 From 23dd2653ef965926a192a009947f23f1578c2f59 Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Wed, 6 Jul 2016 13:08:45 -0400 Subject: Remove Origin 1.1 as an option --- utils/src/ooinstall/variants.py | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/src/ooinstall/variants.py b/utils/src/ooinstall/variants.py index faa8ad747..8889e42e6 100644 --- a/utils/src/ooinstall/variants.py +++ b/utils/src/ooinstall/variants.py @@ -52,7 +52,6 @@ AEP = Variant('atomic-enterprise', 'Atomic Enterprise Platform', origin = Variant('origin', 'OpenShift Origin', [ Version('1.2', 'origin'), - Version('1.1', 'origin') ] ) -- cgit v1.2.3