summaryrefslogtreecommitdiffstats
path: root/utils/src
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2016-11-03 10:40:47 -0400
committerSamuel Munilla <smunilla@redhat.com>2016-11-03 10:40:47 -0400
commit0a0f0fc3126179b01f45f76cc85bc30cee428070 (patch)
tree1d576c2a458aaef23213bb49d53c86c0870084ee /utils/src
parenta5f884039104aeffdea0b2ef232b3ea32a9b3132 (diff)
downloadopenshift-0a0f0fc3126179b01f45f76cc85bc30cee428070.tar.gz
openshift-0a0f0fc3126179b01f45f76cc85bc30cee428070.tar.bz2
openshift-0a0f0fc3126179b01f45f76cc85bc30cee428070.tar.xz
openshift-0a0f0fc3126179b01f45f76cc85bc30cee428070.zip
Update flannel etcd vars for 0.5.5
flannel-0.5.5 uses different variable names in /etc/sysconfig/flannel. This writes both the old and next variable name to the file for quick compatibility. Fixes #2635 Fixes Bug 1391515
Diffstat (limited to 'utils/src')
-rw-r--r--utils/src/ooinstall/cli_installer.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 2a23866e0..fe8e19587 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -306,6 +306,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 +322,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