diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-10-12 11:28:11 -0400 |
|---|---|---|
| committer | Samuel Munilla <smunilla@redhat.com> | 2016-10-12 13:16:32 -0400 |
| commit | ff02f9999299d69b7984ee99e81f3fff24afa7a7 (patch) | |
| tree | f047e3822f7d14801ef18478b24064c32755eca7 | |
| parent | c02d227bc2fb34f53bd5dc08da17ad7b8b0a9e4f (diff) | |
| download | openshift-ff02f9999299d69b7984ee99e81f3fff24afa7a7.tar.gz openshift-ff02f9999299d69b7984ee99e81f3fff24afa7a7.tar.bz2 openshift-ff02f9999299d69b7984ee99e81f3fff24afa7a7.tar.xz openshift-ff02f9999299d69b7984ee99e81f3fff24afa7a7.zip | |
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
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 11 |
1 files 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. |