summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2015-11-16 12:19:01 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2015-11-16 12:19:01 -0400
commit77e9ebdc9c576015c886ed31ae26b693a9eace91 (patch)
treebe7f7250f25bdac2a969f8013159b7622ecba5bb
parent037950923abd5188977e825d994f14111b0e6a89 (diff)
downloadopenshift-77e9ebdc9c576015c886ed31ae26b693a9eace91.tar.gz
openshift-77e9ebdc9c576015c886ed31ae26b693a9eace91.tar.bz2
openshift-77e9ebdc9c576015c886ed31ae26b693a9eace91.tar.xz
openshift-77e9ebdc9c576015c886ed31ae26b693a9eace91.zip
Default to installing OSE 3.1 instead of 3.0.
-rw-r--r--utils/src/ooinstall/cli_installer.py1
-rw-r--r--utils/src/ooinstall/variants.py6
2 files changed, 4 insertions, 3 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 3b5dbaf0e..daffe4aea 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -205,6 +205,7 @@ def get_variant_and_version():
message = "%s\n(%s) %s %s" % (message, i, variant.description,
version.name)
i = i + 1
+ message = "%s\n" % message
click.echo(message)
response = click.prompt("Choose a variant from above: ", default=1)
diff --git a/utils/src/ooinstall/variants.py b/utils/src/ooinstall/variants.py
index 3bb61dddb..571025543 100644
--- a/utils/src/ooinstall/variants.py
+++ b/utils/src/ooinstall/variants.py
@@ -30,14 +30,14 @@ class Variant(object):
self.versions = versions
def latest_version(self):
- return self.versions[-1]
+ return self.versions[0]
# WARNING: Keep the versions ordered, most recent last:
OSE = Variant('openshift-enterprise', 'OpenShift Enterprise',
[
- Version('3.0', 'enterprise'),
- Version('3.1', 'openshift-enterprise')
+ Version('3.1', 'openshift-enterprise'),
+ Version('3.0', 'enterprise')
]
)