summaryrefslogtreecommitdiffstats
path: root/utils/src/ooinstall
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-01 10:25:56 -0400
committerGitHub <noreply@github.com>2016-08-01 10:25:56 -0400
commit671443bd8a6455f0fad505f50b40b7c65f88ca56 (patch)
treec7f874d2130f5a9ebe3590d6d08a8a84f436d33a /utils/src/ooinstall
parentb903304fa1da8366b71667d5b4e8146d6560bfb8 (diff)
parente63a254f473f31baec39394776d71d3318581d94 (diff)
downloadopenshift-671443bd8a6455f0fad505f50b40b7c65f88ca56.tar.gz
openshift-671443bd8a6455f0fad505f50b40b7c65f88ca56.tar.bz2
openshift-671443bd8a6455f0fad505f50b40b7c65f88ca56.tar.xz
openshift-671443bd8a6455f0fad505f50b40b7c65f88ca56.zip
Merge pull request #2242 from smunilla/BZ1358101
a-o-i: Remove AEP, OSE 3.0, and OSE 3.2 choices
Diffstat (limited to 'utils/src/ooinstall')
-rw-r--r--utils/src/ooinstall/variants.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/utils/src/ooinstall/variants.py b/utils/src/ooinstall/variants.py
index 8889e42e6..2397ee9cc 100644
--- a/utils/src/ooinstall/variants.py
+++ b/utils/src/ooinstall/variants.py
@@ -37,15 +37,6 @@ class Variant(object):
OSE = Variant('openshift-enterprise', 'OpenShift Enterprise',
[
Version('3.2', 'openshift-enterprise'),
- Version('3.1', 'openshift-enterprise'),
- Version('3.0', 'enterprise')
- ]
-)
-
-AEP = Variant('atomic-enterprise', 'Atomic Enterprise Platform',
- [
- Version('3.2', 'atomic-enterprise'),
- Version('3.1', 'atomic-enterprise')
]
)
@@ -56,8 +47,8 @@ origin = Variant('origin', 'OpenShift Origin',
)
# Ordered list of variants we can install, first is the default.
-SUPPORTED_VARIANTS = (OSE, AEP, origin)
-DISPLAY_VARIANTS = (OSE, AEP)
+SUPPORTED_VARIANTS = (OSE, origin)
+DISPLAY_VARIANTS = (OSE, )
def find_variant(name, version=None):
"""