diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2015-12-01 15:09:10 -0400 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2015-12-01 15:09:10 -0400 |
| commit | bd43109412c1477fde8152db7e84d73c857d544f (patch) | |
| tree | deda8de71998f48f7030982d39ab74178f586444 /utils/src/ooinstall/cli_installer.py | |
| parent | d7ff5b10a3de3f7966148d9e08c0468ef3d6a7f0 (diff) | |
| download | openshift-bd43109412c1477fde8152db7e84d73c857d544f.tar.gz openshift-bd43109412c1477fde8152db7e84d73c857d544f.tar.bz2 openshift-bd43109412c1477fde8152db7e84d73c857d544f.tar.xz openshift-bd43109412c1477fde8152db7e84d73c857d544f.zip | |
Centralize etcd/schedulability logic for each host.
Diffstat (limited to 'utils/src/ooinstall/cli_installer.py')
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index dbe3f6c32..8cabe5431 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -212,16 +212,13 @@ deployment.""" def print_host_summary(all_hosts, host): - description_tokens = [] - masters = [ahost for ahost in all_hosts if ahost.master] - nodes = [ahost for ahost in all_hosts if ahost.node] click.echo("- %s" % host.connect_to) if host.master: click.echo(" - OpenShift Master") if host.node: - if not host.master: + if host.is_dedicated_node(): click.echo(" - OpenShift Node (Dedicated)") - elif host.master and len(masters) == len(nodes): + elif host.is_schedulable_node(all_hosts): click.echo(" - OpenShift Node") else: click.echo(" - OpenShift Node (Unscheduled)") @@ -231,7 +228,7 @@ def print_host_summary(all_hosts, host): else: click.echo(" - Load Balancer (HAProxy)") if host.master: - if len(masters) > 1: + if host.is_etcd_member(all_hosts): click.echo(" - Etcd Member") else: click.echo(" - Etcd (Embedded)") |