From baf59950a335c5e541dc61352e9c840e3927cc44 Mon Sep 17 00:00:00 2001 From: Samuel Munilla Date: Thu, 3 Nov 2016 11:40:31 -0400 Subject: Update quick installer upgrade mappings for 3.4 Just a quick addition for the upgrade playbooks for 3.4 Fixes Bug 1384291 --- utils/src/ooinstall/cli_installer.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 2a23866e0..286e50f64 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -43,6 +43,16 @@ UPGRADE_MAPPINGS = { 'major_playbook': 'v3_3/upgrade.yml', 'major_version': '3.3', }, + '3.3': { + 'minor_version': '3.3', + 'minor_playbook': 'v3_3/upgrade.yml', + 'major_playbook': 'v3_4/upgrade.yml', + 'major_version': '3.4', + }, + '3.4': { + 'minor_version': '3.4', + 'minor_playbook': 'v3_4/upgrade.yml', + }, } @@ -306,6 +316,7 @@ hostname. else: return None + def set_cluster_hostname(oo_cfg): message = """ You have chosen to install a single master cluster (non-HA). @@ -321,6 +332,7 @@ If you want to override the cluster host name now to something other than the de default='') oo_cfg.deployment.variables['openshift_master_cluster_hostname'] = cluster_hostname + def collect_storage_host(hosts): """ Get a valid host for storage from the user and append it to the list of -- cgit v1.2.3