From b73a8d6f931390c920fafcc1534a1bb429ddb6a9 Mon Sep 17 00:00:00 2001
From: Samuel Munilla <smunilla@redhat.com>
Date: Mon, 16 Nov 2015 14:45:35 -0500
Subject: 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.
---
utils/src/ooinstall/cli_installer.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
(limited to 'utils')
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 3c3f45c3b..d9d3dd80c 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 = []
--
cgit v1.2.3