summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-03 13:32:05 -0400
committerGitHub <noreply@github.com>2016-11-03 13:32:05 -0400
commit17c3d6236adea676c3d9248c3d2f7afb0d582750 (patch)
treea3d3e48891e6d32d3c1216817dea8c68a576d7c9 /utils
parenta5f884039104aeffdea0b2ef232b3ea32a9b3132 (diff)
parentbaf59950a335c5e541dc61352e9c840e3927cc44 (diff)
downloadopenshift-17c3d6236adea676c3d9248c3d2f7afb0d582750.tar.gz
openshift-17c3d6236adea676c3d9248c3d2f7afb0d582750.tar.bz2
openshift-17c3d6236adea676c3d9248c3d2f7afb0d582750.tar.xz
openshift-17c3d6236adea676c3d9248c3d2f7afb0d582750.zip
Merge pull request #2713 from smunilla/BZ1384291
Update quick installer upgrade mappings for 3.4
Diffstat (limited to 'utils')
-rw-r--r--utils/src/ooinstall/cli_installer.py12
1 files changed, 12 insertions, 0 deletions
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