summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-24 10:34:51 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-24 10:34:51 -0500
commitba47106f21fd18c64c3a3bb89980a3e857fbd034 (patch)
treeeb7b4a448a755706a38cbb6d3780100490391277
parent1c326a03caf06e388ecb9a2c3d140445f60005ba (diff)
downloadopenshift-ba47106f21fd18c64c3a3bb89980a3e857fbd034.tar.gz
openshift-ba47106f21fd18c64c3a3bb89980a3e857fbd034.tar.bz2
openshift-ba47106f21fd18c64c3a3bb89980a3e857fbd034.tar.xz
openshift-ba47106f21fd18c64c3a3bb89980a3e857fbd034.zip
Avoid printing the master and node totals in the add-a-node scenario
-rw-r--r--utils/src/ooinstall/cli_installer.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 3eee0c32b..812a42795 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -72,7 +72,7 @@ def delete_hosts(hosts):
click.echo("\"{}\" doesn't coorespond to any valid input.".format(del_idx))
return hosts, None
-def collect_hosts(version=None, masters_set=False):
+def collect_hosts(version=None, masters_set=False, print_summary=True):
"""
Collect host information from user. This will later be filled in using
ansible.
@@ -133,11 +133,12 @@ http://docs.openshift.com/enterprise/latest/architecture/infrastructure_componen
hosts.append(host)
- click.echo('')
- click.echo('Current Masters: {}'.format(num_masters))
- click.echo('Current Nodes: {}'.format(len(hosts)))
- click.echo('Additional Masters required for HA: {}'.format(max(min_masters_for_ha - num_masters, 0)))
- click.echo('')
+ if print_summary:
+ click.echo('')
+ click.echo('Current Masters: {}'.format(num_masters))
+ click.echo('Current Nodes: {}'.format(len(hosts)))
+ click.echo('Additional Masters required for HA: {}'.format(max(min_masters_for_ha - num_masters, 0)))
+ click.echo('')
if num_masters <= 1 or num_masters >= min_masters_for_ha:
more_hosts = click.confirm('Do you want to add additional hosts?')
@@ -395,7 +396,7 @@ def collect_new_nodes():
Add new nodes here
"""
click.echo(message)
- return collect_hosts(masters_set=True)
+ return collect_hosts(masters_set=True, print_summary=False)
def get_installed_hosts(hosts, callback_facts):
installed_hosts = []