summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2015-11-16 14:45:35 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-17 14:15:08 -0500
commitcbb7f87e39c98bf4d5e0505ba2884585fc616437 (patch)
tree1b21f06d041305d9c9671df939d738284ae7ca36
parent4c09c5be50e6361cf472d0703a2cde7924a030ed (diff)
downloadopenshift-cbb7f87e39c98bf4d5e0505ba2884585fc616437.tar.gz
openshift-cbb7f87e39c98bf4d5e0505ba2884585fc616437.tar.bz2
openshift-cbb7f87e39c98bf4d5e0505ba2884585fc616437.tar.xz
openshift-cbb7f87e39c98bf4d5e0505ba2884585fc616437.zip
atomic-openshift-installer: Temporarily restrict to single master
For now, we should restrict the quick installer to a single master. This should change in the near future.
-rw-r--r--utils/src/ooinstall/cli_installer.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 6cdc19f20..9988577f3 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -71,7 +71,7 @@ def delete_hosts(hosts):
click.echo("\"{}\" doesn't coorespond to any valid input.".format(del_idx))
return hosts, None
-def collect_hosts():
+def collect_hosts(master_set=False):
"""
Collect host information from user. This will later be filled in using
ansible.
@@ -108,8 +108,10 @@ http://docs.openshift.com/enterprise/latest/architecture/infrastructure_componen
value_proc=validate_prompt_hostname)
host_props['connect_to'] = hostname_or_ip
-
- host_props['master'] = click.confirm('Will this host be an OpenShift Master?')
+ if not master_set:
+ is_master = click.confirm('Will this host be an OpenShift Master?')
+ host_props['master'] = is_master
+ master_set = True
host_props['node'] = True
#TODO: Reenable this option once container installs are out of tech preview
@@ -308,7 +310,7 @@ def collect_new_nodes():
Add new nodes here
"""
click.echo(message)
- return collect_hosts()
+ return collect_hosts(True)
def get_installed_hosts(hosts, callback_facts):
installed_hosts = []