From ff02f9999299d69b7984ee99e81f3fff24afa7a7 Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Wed, 12 Oct 2016 11:28:11 -0400 Subject: Fix upgrade mappings in quick installer Update to use the correct playbook for 3.2 to 3.3 upgrades and some error handling for unsupported upgrades. Fixes Bug 1381411 --- utils/src/ooinstall/cli_installer.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 8f4e6af30..85f18d5d3 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -44,9 +44,9 @@ UPGRADE_MAPPINGS = { '3.2': { 'minor_version': '3.2', 'minor_playbook': 'v3_2/upgrade.yml', - 'major_playbook': 'v3_2/upgrade.yml', + 'major_playbook': 'v3_3/upgrade.yml', 'major_version': '3.3', - } + }, } @@ -930,7 +930,12 @@ def upgrade(ctx, latest_minor, next_major): sys.exit(0) old_version = oo_cfg.settings['variant_version'] - mapping = UPGRADE_MAPPINGS.get(old_version) + + try: + mapping = UPGRADE_MAPPINGS[old_version] + except KeyError: + click.echo('No upgrades available for %s %s' % (variant, old_version)) + sys.exit(0) message = """ This tool will help you upgrade your existing OpenShift installation. -- cgit v1.2.3