summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-07-15 11:08:39 -0400
committerGitHub <noreply@github.com>2016-07-15 11:08:39 -0400
commitac97e4fb515c349c92c3309329364525eb052441 (patch)
tree053b0045a196e2dcdf799fa8cca6940aa455cd86 /utils
parent65ffae3e6edc8902c591dfef792a505a16029698 (diff)
parent5848ccd733fadeb984acdb692bf24a336fcb4ef8 (diff)
downloadopenshift-ac97e4fb515c349c92c3309329364525eb052441.tar.gz
openshift-ac97e4fb515c349c92c3309329364525eb052441.tar.bz2
openshift-ac97e4fb515c349c92c3309329364525eb052441.tar.xz
openshift-ac97e4fb515c349c92c3309329364525eb052441.zip
Merge pull request #2156 from dgoodwin/aoi-32-upgrade-path
Two small upgrade related fixes
Diffstat (limited to 'utils')
-rw-r--r--utils/src/ooinstall/cli_installer.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 5a66c3592..d6f2540bc 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -830,11 +830,11 @@ def upgrade(ctx, latest_minor, next_major):
# upgrade for what you're currently running.
upgrade_mappings = {
'3.1':{
- 'major_playbook':'v3_1_to_v3_2/upgrade.yml',
+ 'major_playbook':'v3_2/upgrade.yml',
'major_version' :'3.2',
},
'3.2':{
- 'minor_playbook':'v3_1_to_v3_2/upgrade.yml',
+ 'minor_playbook':'v3_2/upgrade.yml',
# Uncomment these when we're ready to support 3.3.
# 'major_version' :'3.3',
# 'major_playbook':'v3_1_to_v3_2/upgrade.yml',